From f851f9a7a1163998c649a97559910a71f8ad275f Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期四, 18 九月 2025 16:40:45 +0800
Subject: [PATCH] 1、新增库位码
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs | 212 ++++++++++++++-
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs | 462 ++++++++++++++++++++++-------------
DevApp/Gs.DevApp/Gs.DevApp.csproj | 8
DevApp/Gs.DevApp/Properties/licenses.licx | 43 +-
4 files changed, 509 insertions(+), 216 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
index 8da868d..cea5c95 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -36,6 +36,7 @@
DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -67,22 +68,23 @@
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
- this.txt_remark5 = new Gs.DevApp.UserControl.UcDictionary();
+ this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_isFkc = new DevExpress.XtraEditors.TextEdit();
this.txt_isNg = new DevExpress.XtraEditors.TextEdit();
this.txt_depotCode = new DevExpress.XtraEditors.TextEdit();
this.txt_zuid = new DevExpress.XtraEditors.TextEdit();
this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.txt_description = new DevExpress.XtraEditors.TextEdit();
this.txt_depottype = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -99,7 +101,12 @@
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.bandedGridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
+ this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_DepotModel = new DevExpress.XtraEditors.ComboBoxEdit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -124,15 +131,16 @@
((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
@@ -142,6 +150,10 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bandedGridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_DepotModel.Properties)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -153,9 +165,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1266, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1108, 62);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = "xlsOut_depots{}";
this.toolBarMenu1.xlsOutParameter = null;
@@ -163,10 +176,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1266, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1108, 468);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -175,8 +189,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1264, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1106, 442);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -185,6 +200,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -197,17 +213,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1264, 570);
+ this.split1.Size = new System.Drawing.Size(1106, 442);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1264, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1106, 402);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -217,7 +235,7 @@
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 60;
+ this.gridView1.ColumnPanelRowHeight = 47;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn1,
this.gv_depotCode,
@@ -235,8 +253,9 @@
this.gridColumn8,
this.gridColumn9,
this.gridColumn10});
+ this.gridView1.DetailHeight = 272;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 44;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -246,201 +265,204 @@
//
this.gridColumn1.Caption = "浣跨敤缁勭粐";
this.gridColumn1.FieldName = "fSubsidiary";
- this.gridColumn1.MinWidth = 50;
+ this.gridColumn1.MinWidth = 44;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Tag = "org.FNumber";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 250;
+ this.gridColumn1.Width = 219;
//
// gv_depotCode
//
this.gv_depotCode.AppearanceCell.Options.UseFont = true;
this.gv_depotCode.Caption = "浠撳簱缂栫爜";
this.gv_depotCode.FieldName = "depotCode";
- this.gv_depotCode.MinWidth = 50;
+ this.gv_depotCode.MinWidth = 44;
this.gv_depotCode.Name = "gv_depotCode";
this.gv_depotCode.OptionsColumn.AllowEdit = false;
this.gv_depotCode.Tag = "query_a.depot_code";
this.gv_depotCode.Visible = true;
this.gv_depotCode.VisibleIndex = 1;
- this.gv_depotCode.Width = 100;
+ this.gv_depotCode.Width = 87;
//
// gv_depotName
//
this.gv_depotName.AppearanceCell.Options.UseFont = true;
this.gv_depotName.Caption = "浠撳簱鍚嶇О";
this.gv_depotName.FieldName = "depotName";
- this.gv_depotName.MinWidth = 50;
+ this.gv_depotName.MinWidth = 44;
this.gv_depotName.Name = "gv_depotName";
this.gv_depotName.OptionsColumn.AllowEdit = false;
this.gv_depotName.Tag = "query_a.depot_name";
this.gv_depotName.Visible = true;
this.gv_depotName.VisibleIndex = 2;
- this.gv_depotName.Width = 150;
+ this.gv_depotName.Width = 131;
//
// gv_depottype
//
this.gv_depottype.AppearanceCell.Options.UseFont = true;
- this.gv_depottype.Caption = "Mes浠撳簱灞炴��";
- this.gv_depottype.FieldName = "remark5";
- this.gv_depottype.MinWidth = 50;
+ this.gv_depottype.Caption = "浠撳簱灞炴��";
+ this.gv_depottype.FieldName = "depottype";
+ this.gv_depottype.MinWidth = 44;
this.gv_depottype.Name = "gv_depottype";
this.gv_depottype.OptionsColumn.AllowEdit = false;
this.gv_depottype.Tag = "query_a.depottype";
this.gv_depottype.Visible = true;
this.gv_depottype.VisibleIndex = 3;
- this.gv_depottype.Width = 80;
+ this.gv_depottype.Width = 70;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "浠撳簱璐熻矗浜�";
this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 50;
+ this.gv_createBy.MinWidth = 44;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 4;
- this.gv_createBy.Width = 71;
+ this.gv_createBy.Width = 62;
//
// gv_zuid
//
this.gv_zuid.AppearanceCell.Options.UseFont = true;
this.gv_zuid.Caption = "鍒嗙粍";
this.gv_zuid.FieldName = "zuid";
- this.gv_zuid.MinWidth = 50;
+ this.gv_zuid.MinWidth = 44;
this.gv_zuid.Name = "gv_zuid";
this.gv_zuid.OptionsColumn.AllowEdit = false;
this.gv_zuid.Tag = "query_a.zuid";
- this.gv_zuid.Width = 71;
+ this.gv_zuid.Width = 62;
//
// gv_isFkc
//
this.gv_isFkc.AppearanceCell.Options.UseFont = true;
this.gv_isFkc.Caption = "鍏佽璐熷簱瀛�";
this.gv_isFkc.FieldName = "isFkc";
- this.gv_isFkc.MaxWidth = 60;
- this.gv_isFkc.MinWidth = 60;
+ this.gv_isFkc.MaxWidth = 52;
+ this.gv_isFkc.MinWidth = 52;
this.gv_isFkc.Name = "gv_isFkc";
this.gv_isFkc.OptionsColumn.AllowEdit = false;
this.gv_isFkc.Tag = "query_a.is_fkc";
- this.gv_isFkc.Width = 60;
+ this.gv_isFkc.Visible = true;
+ this.gv_isFkc.VisibleIndex = 5;
+ this.gv_isFkc.Width = 52;
//
// gridColumn2
//
this.gridColumn2.Caption = "绂佺敤鐘舵��";
this.gridColumn2.FieldName = "isNg";
- this.gridColumn2.MaxWidth = 50;
- this.gridColumn2.MinWidth = 50;
+ this.gridColumn2.MaxWidth = 44;
+ this.gridColumn2.MinWidth = 44;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Tag = "query_a.zuid";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 5;
- this.gridColumn2.Width = 50;
+ this.gridColumn2.VisibleIndex = 6;
+ this.gridColumn2.Width = 44;
//
// gridColumn6
//
this.gridColumn6.Caption = "渚涘簲鍟�";
this.gridColumn6.FieldName = "suppLierId";
- this.gridColumn6.MinWidth = 60;
+ this.gridColumn6.MinWidth = 52;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Tag = "query_a.SUPPLIER_ID";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 6;
- this.gridColumn6.Width = 70;
+ this.gridColumn6.VisibleIndex = 7;
+ this.gridColumn6.Width = 61;
//
// gridColumn5
//
this.gridColumn5.Caption = "瀹㈡埛";
this.gridColumn5.FieldName = "clientId";
- this.gridColumn5.MinWidth = 60;
+ this.gridColumn5.MinWidth = 52;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "query_a.Client_Id";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 7;
- this.gridColumn5.Width = 60;
+ this.gridColumn5.VisibleIndex = 8;
+ this.gridColumn5.Width = 52;
//
// gridColumn4
//
this.gridColumn4.Caption = "閮ㄩ棬";
this.gridColumn4.FieldName = "department";
- this.gridColumn4.MinWidth = 60;
+ this.gridColumn4.MinWidth = 52;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Tag = "query_a.department";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 8;
- this.gridColumn4.Width = 60;
+ this.gridColumn4.VisibleIndex = 9;
+ this.gridColumn4.Width = 52;
//
// gridColumn7
//
this.gridColumn7.Caption = "鑱旂郴鐢佃瘽";
this.gridColumn7.FieldName = "phone";
- this.gridColumn7.MinWidth = 60;
+ this.gridColumn7.MinWidth = 52;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Tag = "query_a.Phone";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 9;
- this.gridColumn7.Width = 60;
+ this.gridColumn7.VisibleIndex = 10;
+ this.gridColumn7.Width = 52;
//
// gridColumn3
//
this.gridColumn3.Caption = "鍚屾鏃堕棿";
this.gridColumn3.FieldName = "lastupdateDate";
- this.gridColumn3.MinWidth = 50;
+ this.gridColumn3.MinWidth = 44;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Tag = "query_a.lastupdate_date";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 12;
- this.gridColumn3.Width = 180;
+ this.gridColumn3.VisibleIndex = 13;
+ this.gridColumn3.Width = 157;
//
// gridColumn8
//
this.gridColumn8.Caption = "涓婚敭Guid";
this.gridColumn8.FieldName = "guid";
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 22;
this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Width = 94;
+ this.gridColumn8.Width = 82;
//
// gridColumn9
//
this.gridColumn9.Caption = "浠撳簱ID";
this.gridColumn9.FieldName = "depotId";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 22;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 10;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.VisibleIndex = 11;
+ this.gridColumn9.Width = 82;
//
// gridColumn10
//
this.gridColumn10.Caption = "鏁版嵁鐘舵��";
this.gridColumn10.FieldName = "documentStatus";
- this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.MinWidth = 22;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 11;
- this.gridColumn10.Width = 94;
+ this.gridColumn10.VisibleIndex = 12;
+ this.gridColumn10.Width = 82;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 402);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1264, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1106, 30);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.splitMx1);
+ this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1264, 570);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1106, 442);
this.xtraTabPage3.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -448,6 +470,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -460,118 +483,139 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1264, 570);
- this.splitMx1.SplitterPosition = 76;
+ this.splitMx1.Size = new System.Drawing.Size(1106, 442);
+ this.splitMx1.SplitterPosition = 113;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
- this.layoutMx1.Controls.Add(this.txt_remark5);
+ this.layoutMx1.Controls.Add(this.ucBtnPrint1);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_isFkc);
this.layoutMx1.Controls.Add(this.txt_isNg);
this.layoutMx1.Controls.Add(this.txt_depotCode);
this.layoutMx1.Controls.Add(this.txt_zuid);
this.layoutMx1.Controls.Add(this.txt_depotName);
+ this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_description);
this.layoutMx1.Controls.Add(this.txt_depottype);
+ this.layoutMx1.Controls.Add(this.txt_DepotModel);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem9,
- this.layoutControlItem6});
+ this.layoutControlItem9});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(460, 453, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1264, 76);
+ this.layoutMx1.Size = new System.Drawing.Size(1106, 113);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
- // txt_remark5
+ // ucBtnPrint1
//
- this.txt_remark5.BtnTxt = "浠撳簱灞炴��";
- this.txt_remark5.Location = new System.Drawing.Point(945, 12);
- this.txt_remark5.Name = "txt_remark5";
- this.txt_remark5.Size = new System.Drawing.Size(307, 52);
- this.txt_remark5.TabIndex = 292;
- this.txt_remark5.TextTxt = "";
- this.txt_remark5.WhereTxt = " a.s_type=\'浠撳簱灞炴�' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
+ this.ucBtnPrint1.allClickKey = null;
+ this.ucBtnPrint1.guidKey = null;
+ this.ucBtnPrint1.Location = new System.Drawing.Point(554, 74);
+ this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
+ this.ucBtnPrint1.Name = "ucBtnPrint1";
+ this.ucBtnPrint1.rptParameter = null;
+ this.ucBtnPrint1.Size = new System.Drawing.Size(267, 27);
+ this.ucBtnPrint1.TabIndex = 292;
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(945, 96);
+ this.lbGuid.Location = new System.Drawing.Point(825, 74);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(307, 80);
+ this.lbGuid.Size = new System.Drawing.Size(269, 27);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_isFkc
//
- this.txt_isFkc.Location = new System.Drawing.Point(721, 12);
+ this.txt_isFkc.Location = new System.Drawing.Point(909, 12);
+ this.txt_isFkc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_isFkc.Name = "txt_isFkc";
this.txt_isFkc.Properties.Appearance.Options.UseFont = true;
- this.txt_isFkc.Size = new System.Drawing.Size(220, 24);
+ this.txt_isFkc.Size = new System.Drawing.Size(185, 20);
this.txt_isFkc.StyleController = this.layoutMx1;
this.txt_isFkc.TabIndex = 291;
this.txt_isFkc.Tag = "readonly";
//
// txt_isNg
//
- this.txt_isNg.Location = new System.Drawing.Point(721, 40);
+ this.txt_isNg.Location = new System.Drawing.Point(909, 43);
+ this.txt_isNg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_isNg.Name = "txt_isNg";
this.txt_isNg.Properties.Appearance.Options.UseFont = true;
- this.txt_isNg.Size = new System.Drawing.Size(220, 24);
+ this.txt_isNg.Size = new System.Drawing.Size(185, 20);
this.txt_isNg.StyleController = this.layoutMx1;
this.txt_isNg.TabIndex = 267;
this.txt_isNg.Tag = "readonly";
//
// txt_depotCode
//
- this.txt_depotCode.Location = new System.Drawing.Point(99, 12);
+ this.txt_depotCode.Location = new System.Drawing.Point(96, 12);
+ this.txt_depotCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_depotCode.Name = "txt_depotCode";
this.txt_depotCode.Properties.Appearance.Options.UseFont = true;
- this.txt_depotCode.Size = new System.Drawing.Size(220, 24);
+ this.txt_depotCode.Size = new System.Drawing.Size(183, 20);
this.txt_depotCode.StyleController = this.layoutMx1;
this.txt_depotCode.TabIndex = 213;
this.txt_depotCode.Tag = "readonly";
//
// txt_zuid
//
- this.txt_zuid.Location = new System.Drawing.Point(721, 52);
+ this.txt_zuid.Location = new System.Drawing.Point(638, 43);
+ this.txt_zuid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_zuid.Name = "txt_zuid";
this.txt_zuid.Properties.Appearance.Options.UseFont = true;
- this.txt_zuid.Size = new System.Drawing.Size(220, 24);
+ this.txt_zuid.Size = new System.Drawing.Size(183, 20);
this.txt_zuid.StyleController = this.layoutMx1;
this.txt_zuid.TabIndex = 285;
this.txt_zuid.Tag = "readonly";
//
// txt_depotName
//
- this.txt_depotName.Location = new System.Drawing.Point(410, 12);
+ this.txt_depotName.Location = new System.Drawing.Point(367, 12);
+ this.txt_depotName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_depotName.Name = "txt_depotName";
this.txt_depotName.Properties.Appearance.Options.UseFont = true;
- this.txt_depotName.Size = new System.Drawing.Size(220, 24);
+ this.txt_depotName.Size = new System.Drawing.Size(183, 20);
this.txt_depotName.StyleController = this.layoutMx1;
this.txt_depotName.TabIndex = 216;
this.txt_depotName.Tag = "readonly";
//
+ // txt_createBy
+ //
+ this.txt_createBy.Location = new System.Drawing.Point(638, 12);
+ this.txt_createBy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_createBy.Name = "txt_createBy";
+ this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_createBy.Size = new System.Drawing.Size(183, 20);
+ this.txt_createBy.StyleController = this.layoutMx1;
+ this.txt_createBy.TabIndex = 219;
+ this.txt_createBy.Tag = "readonly";
+ //
// txt_description
//
- this.txt_description.Location = new System.Drawing.Point(99, 40);
+ this.txt_description.Location = new System.Drawing.Point(96, 43);
+ this.txt_description.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_description.Name = "txt_description";
this.txt_description.Properties.Appearance.Options.UseFont = true;
- this.txt_description.Size = new System.Drawing.Size(220, 24);
+ this.txt_description.Size = new System.Drawing.Size(183, 20);
this.txt_description.StyleController = this.layoutMx1;
this.txt_description.TabIndex = 217;
this.txt_description.Tag = "readonly";
//
// txt_depottype
//
- this.txt_depottype.Location = new System.Drawing.Point(410, 40);
+ this.txt_depottype.Location = new System.Drawing.Point(367, 43);
+ this.txt_depottype.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_depottype.Name = "txt_depottype";
this.txt_depottype.Properties.Appearance.Options.UseFont = true;
- this.txt_depottype.Size = new System.Drawing.Size(220, 24);
+ this.txt_depottype.Size = new System.Drawing.Size(183, 20);
this.txt_depottype.StyleController = this.layoutMx1;
this.txt_depottype.TabIndex = 231;
this.txt_depottype.Tag = "readonly";
@@ -579,38 +623,30 @@
// layoutControlItem9
//
this.layoutControlItem9.Control = this.lbGuid;
- this.layoutControlItem9.Location = new System.Drawing.Point(933, 84);
+ this.layoutControlItem9.Location = new System.Drawing.Point(813, 62);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(311, 84);
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem9.Size = new System.Drawing.Size(273, 31);
this.layoutControlItem9.Text = "lbGuid";
this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem9.TextVisible = false;
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_zuid;
- this.layoutControlItem6.Location = new System.Drawing.Point(622, 40);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(311, 40);
- this.layoutControlItem6.Text = "鍒嗙粍";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem1,
this.layoutControlItem2,
+ this.layoutControlItem3,
this.layoutControlItem4,
this.layoutControlItem5,
+ this.layoutControlItem6,
this.layoutControlItem7,
this.layoutControlItem8,
- this.layoutControlItem10});
+ this.layoutControlItem10,
+ this.layoutControlItem11,
+ this.layoutControlItem1});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -630,83 +666,97 @@
rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition2.Height = 100D;
rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
- rowDefinition2});
- this.Root.Size = new System.Drawing.Size(1264, 76);
+ rowDefinition2,
+ rowDefinition3});
+ this.Root.Size = new System.Drawing.Size(1106, 113);
this.Root.TextVisible = false;
- //
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.txt_depotCode;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(311, 28);
- this.layoutControlItem1.Text = "浠撳簱缂栫爜";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_depotName;
- this.layoutControlItem2.Location = new System.Drawing.Point(311, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(311, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem2.Text = "浠撳簱鍚嶇О";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_createBy;
+ this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem3.Text = "浠撳簱璐熻矗浜�";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_description;
- this.layoutControlItem4.CustomizationFormText = "浠撳簱澶囨敞";
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(311, 28);
- this.layoutControlItem4.Text = "浠撳簱澶囨敞";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem4.Text = "澶囨敞";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_depottype;
- this.layoutControlItem5.Location = new System.Drawing.Point(311, 28);
+ this.layoutControlItem5.Location = new System.Drawing.Point(271, 31);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(311, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem5.Text = "浠撳簱绫诲瀷";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_zuid;
+ this.layoutControlItem6.Location = new System.Drawing.Point(542, 31);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem6.Text = "鍒嗙粍";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_isFkc;
- this.layoutControlItem7.Location = new System.Drawing.Point(622, 0);
+ this.layoutControlItem7.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(311, 28);
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem7.Size = new System.Drawing.Size(273, 31);
this.layoutControlItem7.Text = "鍏佽璐熷簱瀛�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_isNg;
- this.layoutControlItem8.Location = new System.Drawing.Point(622, 28);
+ this.layoutControlItem8.Location = new System.Drawing.Point(813, 31);
this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(311, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(273, 31);
this.layoutControlItem8.Text = "绂佺敤鐘舵��";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem10
//
- this.layoutControlItem10.Control = this.txt_remark5;
- this.layoutControlItem10.Location = new System.Drawing.Point(933, 0);
+ this.layoutControlItem10.Control = this.ucBtnPrint1;
+ this.layoutControlItem10.CustomizationFormText = "鎵撳嵃鎸夐挳";
+ this.layoutControlItem10.Location = new System.Drawing.Point(542, 62);
this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem10.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(311, 56);
- this.layoutControlItem10.Text = "浠撳簱灞炴��";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem10.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
//
@@ -714,9 +764,10 @@
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1264, 482);
+ this.tabMx.Size = new System.Drawing.Size(1106, 319);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -724,22 +775,26 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1262, 450);
+ this.tabMxPage1.Size = new System.Drawing.Size(1104, 293);
this.tabMxPage1.Text = "浠撲綅鍒楄〃";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1262, 450);
+ this.gcMx1.Size = new System.Drawing.Size(1104, 293);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx1});
+ this.gvMx1,
+ this.bandedGridView1});
//
// gvMx1
//
@@ -753,6 +808,7 @@
this.gvMx1lastupdateDate,
this.gvMxDel,
this.gridColumn11});
+ this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -765,83 +821,83 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 50;
+ this.gvMx1guid.MinWidth = 44;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
+ this.gvMx1guid.Width = 82;
//
// gvMx1depotSectionCode
//
this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜";
this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
- this.gvMx1depotSectionCode.MinWidth = 50;
+ this.gvMx1depotSectionCode.MinWidth = 44;
this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
this.gvMx1depotSectionCode.Tag = "edit";
this.gvMx1depotSectionCode.Visible = true;
this.gvMx1depotSectionCode.VisibleIndex = 0;
- this.gvMx1depotSectionCode.Width = 94;
+ this.gvMx1depotSectionCode.Width = 82;
//
// gvMx1depotSectionName
//
this.gvMx1depotSectionName.AppearanceCell.Options.UseFont = true;
this.gvMx1depotSectionName.Caption = "璐т綅鍚嶇О";
this.gvMx1depotSectionName.FieldName = "depotSectionName";
- this.gvMx1depotSectionName.MinWidth = 50;
+ this.gvMx1depotSectionName.MinWidth = 44;
this.gvMx1depotSectionName.Name = "gvMx1depotSectionName";
this.gvMx1depotSectionName.Tag = "edit";
this.gvMx1depotSectionName.Visible = true;
this.gvMx1depotSectionName.VisibleIndex = 1;
- this.gvMx1depotSectionName.Width = 94;
+ this.gvMx1depotSectionName.Width = 82;
//
// gvMx1description
//
this.gvMx1description.AppearanceCell.Options.UseFont = true;
this.gvMx1description.Caption = "澶囨敞";
this.gvMx1description.FieldName = "description";
- this.gvMx1description.MinWidth = 50;
+ this.gvMx1description.MinWidth = 44;
this.gvMx1description.Name = "gvMx1description";
this.gvMx1description.Tag = "edit";
this.gvMx1description.Visible = true;
this.gvMx1description.VisibleIndex = 2;
- this.gvMx1description.Width = 94;
+ this.gvMx1description.Width = 82;
//
// gvMx1lastupdateBy
//
this.gvMx1lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gvMx1lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉";
this.gvMx1lastupdateBy.FieldName = "lastupdateBy";
- this.gvMx1lastupdateBy.MinWidth = 50;
+ this.gvMx1lastupdateBy.MinWidth = 44;
this.gvMx1lastupdateBy.Name = "gvMx1lastupdateBy";
this.gvMx1lastupdateBy.OptionsColumn.ReadOnly = true;
this.gvMx1lastupdateBy.Tag = "query_a.lastupdate_by";
this.gvMx1lastupdateBy.Visible = true;
this.gvMx1lastupdateBy.VisibleIndex = 3;
- this.gvMx1lastupdateBy.Width = 94;
+ this.gvMx1lastupdateBy.Width = 82;
//
// gvMx1lastupdateDate
//
this.gvMx1lastupdateDate.AppearanceCell.Options.UseFont = true;
this.gvMx1lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂�";
this.gvMx1lastupdateDate.FieldName = "lastupdateDate";
- this.gvMx1lastupdateDate.MinWidth = 50;
+ this.gvMx1lastupdateDate.MinWidth = 44;
this.gvMx1lastupdateDate.Name = "gvMx1lastupdateDate";
this.gvMx1lastupdateDate.OptionsColumn.ReadOnly = true;
this.gvMx1lastupdateDate.Tag = "query_a.lastupdate_date";
this.gvMx1lastupdateDate.Visible = true;
this.gvMx1lastupdateDate.VisibleIndex = 4;
- this.gvMx1lastupdateDate.Width = 180;
+ this.gvMx1lastupdateDate.Width = 157;
//
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 25;
+ this.gvMxDel.MinWidth = 22;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
this.gvMxDel.VisibleIndex = 6;
- this.gvMxDel.Width = 100;
+ this.gvMxDel.Width = 87;
//
// repositoryItemButtonEdit1
//
@@ -858,19 +914,70 @@
//
this.gridColumn11.Caption = "鎵�灞炰粨搴揑D";
this.gridColumn11.FieldName = "depotGuid";
- this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.MinWidth = 22;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 5;
- this.gridColumn11.Width = 94;
+ this.gridColumn11.Width = 82;
+ //
+ // bandedGridView1
+ //
+ this.bandedGridView1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand1});
+ this.bandedGridView1.GridControl = this.gcMx1;
+ this.bandedGridView1.Name = "bandedGridView1";
+ //
+ // gridBand1
+ //
+ this.gridBand1.Caption = "gridBand1";
+ this.gridBand1.Name = "gridBand1";
+ this.gridBand1.VisibleIndex = 0;
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_DepotModel;
+ this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem11.CustomizationFormText = "閫夋嫨搴撲綅妯℃澘";
+ this.layoutControlItem11.Location = new System.Drawing.Point(271, 62);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem11.Text = "閫夋嫨搴撲綅妯℃澘";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_depotCode;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem1.Text = "浠撳簱缂栫爜";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // txt_DepotModel
+ //
+ this.txt_DepotModel.Location = new System.Drawing.Point(367, 74);
+ this.txt_DepotModel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_DepotModel.Name = "txt_DepotModel";
+ this.txt_DepotModel.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_DepotModel.Properties.Items.AddRange(new object[] {
+ "搴撲綅鐮侊紙灏忥級",
+ "搴撲綅鐮侊紙澶э級"});
+ this.txt_DepotModel.Size = new System.Drawing.Size(183, 20);
+ this.txt_DepotModel.StyleController = this.layoutMx1;
+ this.txt_DepotModel.TabIndex = 272;
+ this.txt_DepotModel.Tag = "readOnly-1";
//
// Frm_MesDepot
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1266, 682);
+ this.ClientSize = new System.Drawing.Size(1108, 530);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "Frm_MesDepot";
this.Text = "浠撳簱";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -897,15 +1004,16 @@
((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
@@ -915,6 +1023,10 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bandedGridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_DepotModel.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -947,15 +1059,16 @@
private DevExpress.XtraEditors.TextEdit txt_isFkc;
private DevExpress.XtraEditors.TextEdit txt_zuid;
private DevExpress.XtraEditors.TextEdit txt_depottype;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_description;
private DevExpress.XtraEditors.TextEdit txt_depotName;
private DevExpress.XtraEditors.TextEdit txt_depotCode;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
@@ -972,11 +1085,16 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraEditors.TextEdit txt_isNg;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
- private UserControl.UcDictionary txt_remark5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraGrid.Views.BandedGrid.BandedGridView bandedGridView1;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
+ private UserControl.UcBtnPrint ucBtnPrint1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_iCount_1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
index 3700bab..fc66fbc 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -1,6 +1,7 @@
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -20,6 +21,73 @@
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesDepotsManager/";
+ private DevExpress.XtraEditors.ComboBoxEdit txt_DepotModel;
+ private string _kwModel;
+
+ /* public Frm_MesDepot()
+ {
+ InitializeComponent();
+ toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+ toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+ toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ this.toolBarMenu1.getXmlConfig();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ }, tips);
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }, lbGuid);
+ getPageList(1);
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+
+ //鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
+ this.ucBtnPrint1.btnAllClick += (s, e) =>
+ {
+ string rowGuid = lbGuid.Text.Trim();
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "浠撲綅鐮�");
+ string strCodeList = "";
+ frm.UpdateParent += (ss, ee) =>
+ {
+ strCodeList = ee.StringSingle;
+ };
+ frm.ShowDialog();
+ if (string.IsNullOrEmpty(strCodeList))
+ return;
+ try
+ {
+ string rptParameter = "rpt_KW1{"
+ + "100"//閲嶆墦閮芥槸浼�100锛�
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
+ };
+ this.ucBtnPrint1.SetPrintButton(false);
+
+ }
+ */
+
+ /*******搴撲綅鏉＄爜妯℃澘鍒囨崲*****/
public Frm_MesDepot()
{
InitializeComponent();
@@ -31,9 +99,9 @@
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- }, tips);
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
@@ -43,6 +111,110 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+
+ // 鍒濆鍖杢xt_DepotModel鎺т欢
+ InitDepotModelControl();
+
+ //鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
+ this.ucBtnPrint1.btnAllClick += (s, e) =>
+ {
+ string rowGuid = lbGuid.Text.Trim();
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "浠撲綅鐮�");
+ string strCodeList = "";
+ frm.UpdateParent += (ss, ee) =>
+ {
+ strCodeList = ee.StringSingle;
+ };
+ frm.ShowDialog();
+ if (string.IsNullOrEmpty(strCodeList))
+ return;
+
+ try
+ {
+ // 鏍规嵁閫夋嫨鐨勫�艰缃姤琛ㄦā鍨�
+ SetKwModelBySelectedValue();
+
+ // 楠岃瘉妯″瀷鏄惁鏈夋晥
+ if (string.IsNullOrEmpty(_kwModel))
+ {
+ MsgHelper.Warning("璇烽�夋嫨鏈夋晥鐨勫簱浣嶆ā鍨嬬被鍨�");
+ return;
+ }
+
+ // 浣跨敤鍔ㄦ�佹ā鍨嬪悕绉版瀯寤哄弬鏁�
+ string rptParameter = $"{_kwModel}{{"
+ + "100" // 閲嶆墦閮芥槸浼�100
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
+ };
+ this.ucBtnPrint1.SetPrintButton(false);
+ }
+
+ /// <summary>
+ /// 鍒濆鍖杢xt_DepotModel鎺т欢锛堟煡鎵惧苟璧嬪�硷級
+ /// </summary>
+ private void InitDepotModelControl()
+ {
+ // 閫掑綊鏌ユ壘绐椾綋涓墍鏈夋帶浠讹紙鍖呮嫭瀛愬鍣級
+ Control[] foundControls = this.Controls.Find("txt_DepotModel", true);
+ if (foundControls != null && foundControls.Length > 0 && foundControls[0] is DevExpress.XtraEditors.ComboBoxEdit)
+ {
+ txt_DepotModel = (DevExpress.XtraEditors.ComboBoxEdit)foundControls[0];
+ }
+ else
+ {
+ System.Diagnostics.Debug.WriteLine("璀﹀憡锛氭湭鎵惧埌txt_DepotModel鎺т欢锛岃妫�鏌ユ帶浠禢ame鏄惁姝ｇ‘");
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁txt_DepotModel閫夋嫨鐨勫�艰缃甠kwModel
+ /// </summary>
+ private void SetKwModelBySelectedValue()
+ {
+ // 閲嶇疆妯″瀷鍊�
+ _kwModel = string.Empty;
+
+ // 妫�鏌ユ帶浠舵槸鍚﹀瓨鍦�
+ if (txt_DepotModel == null)
+ {
+ MsgHelper.ShowError("鏈壘鍒板簱浣嶆ā鍨嬮�夋嫨鎺т欢");
+ return;
+ }
+
+ // 鑾峰彇閫夋嫨鐨勫��
+ string selectedValue = txt_DepotModel.EditValue?.ToString().Trim() ?? string.Empty;
+ string selectedText = txt_DepotModel.Text?.Trim() ?? string.Empty;
+
+ // 鍒ゆ柇閫夋嫨鐨勫�煎苟璁剧疆瀵瑰簲鐨勬ā鍨�
+ // 杩欓噷鍚屾椂鍒ゆ柇EditValue鍜孴ext锛岀‘淇濆吋瀹规�э紙鏍规嵁瀹為檯鏁版嵁缁戝畾鎯呭喌璋冩暣锛�
+ if (selectedValue == "搴撲綅鐮侊紙灏忥級" || selectedText == "搴撲綅鐮侊紙灏忥級")
+ {
+ _kwModel = "rpt_KW";
+ }
+ else if (selectedValue == "搴撲綅鐮侊紙澶э級" || selectedText == "搴撲綅鐮侊紙澶э級")
+ {
+ _kwModel = "rpt_KW1";
+ }
+ else
+ {
+ MsgHelper.Warning("璇烽�夋嫨鏈夋晥鐨勫簱浣嶇爜绫诲瀷锛堝皬/澶э級");
+ }
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -159,14 +331,14 @@
toolBarMenu1.isSetBtn = false;
if (string.IsNullOrEmpty(txt_depotCode.Text.Trim()))
{
- MsgHelper.ShowError("浠撳簱缂栫爜涓嶈兘涓虹┖锛�");
+ MsgHelper.Warning("浠撳簱缂栫爜涓嶈兘涓虹┖锛�");
txt_depotCode.Focus();
return;
}
if (string.IsNullOrEmpty(txt_depotName.Text.Trim()))
{
- MsgHelper.ShowError("浠撳簱鍚嶇О涓嶈兘涓虹┖锛�");
+ MsgHelper.Warning("浠撳簱鍚嶇О涓嶈兘涓虹┖锛�");
txt_depotName.Focus();
return;
}
@@ -183,11 +355,11 @@
MsgHelper.ShowError("缂栫爜涓嶈兘涓虹┖锛�");
return;
}
- //if (string.IsNullOrEmpty(row["DepotSectionName"].ToString()))
- //{
- // MsgHelper.ShowError("鍚嶇О涓嶈兘涓虹┖锛�");
- // return;
- //}
+ if (string.IsNullOrEmpty(row["DepotSectionName"].ToString()))
+ {
+ MsgHelper.ShowError("鍚嶇О涓嶈兘涓虹┖锛�");
+ return;
+ }
lst.Add(new MesDepotSections
{
Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
@@ -203,18 +375,18 @@
DepotCode = txt_depotCode.Text,
DepotName = txt_depotName.Text,
Description = txt_description.Text,
- Remark5=txt_remark5.TextTxt.Trim(),
list = lst
};
+
try
{
var strJson = UtilityHelper.HttpPost("",
_webServiceName + "EditModel",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
- MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
var gridViews = new List<GridView>();
@@ -223,12 +395,10 @@
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
- else
- MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
@@ -238,12 +408,10 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null;
- System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and a.FSubsidiary in");
- _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
- _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.depot_code", "asc",
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage,
+ this.pageBar1.RowsCount,
+ "org.FNumber asc ,a.depot_code", "asc",
"", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
@@ -301,7 +469,7 @@
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
- {
+ {
var dy = _rtn.rtnData;
lbGuid.Text = strGuid;
var gvList = new List<GridView>();
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 457f61f..45a48c5 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -107,7 +107,13 @@
<Reference Include="DevExpress.XtraTreeMap.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="FastReport">
- <HintPath>D:\GsMesV2\DevApp\Gs.DevApp\bin\Debug\FastReport.dll</HintPath>
+ <HintPath>..\..\..\..\FastReport.dll</HintPath>
+ </Reference>
+ <Reference Include="FastReport.Bars">
+ <HintPath>..\..\..\..\FastReport.Bars.dll</HintPath>
+ </Reference>
+ <Reference Include="FastReport.Editor">
+ <HintPath>..\..\..\..\FastReport.Editor.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
diff --git a/DevApp/Gs.DevApp/Properties/licenses.licx b/DevApp/Gs.DevApp/Properties/licenses.licx
index 92a620f..81ffea3 100644
--- a/DevApp/Gs.DevApp/Properties/licenses.licx
+++ b/DevApp/Gs.DevApp/Properties/licenses.licx
@@ -1,25 +1,26 @@
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--
Gitblit v1.9.3