From 0cedb538f7bfefa75a80134fffb8d65cf5074e98 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 03 十二月 2025 11:18:40 +0800
Subject: [PATCH] 其他出入库代码搬祈禧的
---
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtdj.Designer.cs | 329 ++++
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtdj.resx | 123 +
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtrkdj.cs | 153 ++
DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.resx | 120 +
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtrkdj.Designer.cs | 329 ++++
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs | 35
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtdj.cs | 152 ++
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 1043 ++++++++------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs | 132 +
DevApp/Gs.DevApp/UserControl/SelectDaa.Designer.cs | 19
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtrkdj.resx | 123 +
DevApp/Gs.DevApp/Gs.DevApp.csproj | 27
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 196 ++
DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs | 10
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 639 +++++---
DevApp/Gs.DevApp/UserControl/SelectDaa.cs | 24
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.resx | 22
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 32
DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.Designer.cs | 59
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 17
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 50
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs | 35
DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.cs | 139 ++
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs | 86
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 246 ++
25 files changed, 3,189 insertions(+), 951 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index 3a9be81..57ec4f2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -1,7 +1,7 @@
/* Create By GS EasyCode */
namespace Gs.DevApp.DevFrm
{
- partial class Frm_MesItemQt
+ partial class Frm_MesItemQt
{
/// <summary>
/// Required designer variable.
@@ -64,10 +64,10 @@
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_qt020 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_qt005 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_qt005Name = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_qt001 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_qt010 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_qt016 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_qt016Name = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_qt002 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -75,6 +75,11 @@
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -88,23 +93,23 @@
this.txt_qt013 = new Gs.DevApp.UserControl.UcLookCustomer();
this.txt_qtck = new DevExpress.XtraEditors.TextEdit();
this.txt_qt019 = new DevExpress.XtraEditors.ComboBoxEdit();
- this.txt_qt024 = new Gs.DevApp.UserControl.UcLookOrg();
this.txt_qt020 = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_qt023 = new Gs.DevApp.UserControl.UcLookOrg();
- this.txt_qt016 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_qt016Name = new DevExpress.XtraEditors.TextEdit();
this.txt_qt002 = new DevExpress.XtraEditors.TextEdit();
this.txt_qt015 = new DevExpress.XtraEditors.CheckEdit();
- this.txt_qt031 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_qt031Name = new DevExpress.XtraEditors.TextEdit();
this.txt_qt030 = new DevExpress.XtraEditors.TextEdit();
this.txt_qt029 = new DevExpress.XtraEditors.CheckEdit();
- this.txt_qt028 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_qt028Name = new DevExpress.XtraEditors.TextEdit();
this.txt_qt027 = new DevExpress.XtraEditors.TextEdit();
- this.txt_qt034 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_qt034Name = new DevExpress.XtraEditors.TextEdit();
this.txt_qt026 = new DevExpress.XtraEditors.CheckEdit();
this.txt_qt033 = new DevExpress.XtraEditors.TextEdit();
this.txt_qt032 = new DevExpress.XtraEditors.CheckEdit();
this.txt_qt035 = new DevExpress.XtraEditors.ButtonEdit();
this.txt_qtlx = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_lyRemark = new DevExpress.XtraEditors.MemoEdit();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -120,17 +125,16 @@
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItemWwgys = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -164,6 +168,9 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.txt_lyRemarklb = new DevExpress.XtraLayout.LayoutControlItem();
+ this.btnDown = new DevExpress.XtraEditors.SimpleButton();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -187,20 +194,21 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qtck.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt020.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt016.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt016Name.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt002.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt031.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt031Name.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt028Name.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt027.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt034Name.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt026.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qtlx.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lyRemark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -216,17 +224,16 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItemWwgys)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
@@ -238,6 +245,8 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptCk)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lyRemarklb)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -249,6 +258,7 @@
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(4, 4, 4, 4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
@@ -321,17 +331,22 @@
this.gridColumn3,
this.gv_qt020,
this.gridColumn4,
- this.gv_qt005,
+ this.gv_qt005Name,
this.gv_qt001,
this.gv_qt010,
- this.gv_qt016,
+ this.gv_qt016Name,
this.gv_qt002,
this.gridColumn5,
this.gridColumn6,
this.gridColumn13,
this.gridColumn14,
this.gridColumn15,
- this.gridColumn20});
+ this.gridColumn20,
+ this.gridColumn21,
+ this.gridColumn22,
+ this.gridColumn23,
+ this.gridColumn24,
+ this.gridColumn25});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -351,7 +366,7 @@
this.gv_qt015.Tag = "query_a.qt015";
this.gv_qt015.UnboundDataType = typeof(bool);
this.gv_qt015.Visible = true;
- this.gv_qt015.VisibleIndex = 0;
+ this.gv_qt015.VisibleIndex = 1;
this.gv_qt015.Width = 50;
//
// gv_qt014
@@ -377,7 +392,7 @@
this.gv_qtck.OptionsColumn.AllowEdit = false;
this.gv_qtck.Tag = "query_a.qtck";
this.gv_qtck.Visible = true;
- this.gv_qtck.VisibleIndex = 4;
+ this.gv_qtck.VisibleIndex = 5;
this.gv_qtck.Width = 100;
//
// gridColumn3
@@ -398,7 +413,7 @@
this.gv_qt020.OptionsColumn.AllowEdit = false;
this.gv_qt020.Tag = "query_a.qt020";
this.gv_qt020.Visible = true;
- this.gv_qt020.VisibleIndex = 6;
+ this.gv_qt020.VisibleIndex = 13;
this.gv_qt020.Width = 94;
//
// gridColumn4
@@ -408,21 +423,21 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 12;
+ this.gridColumn4.VisibleIndex = 15;
this.gridColumn4.Width = 94;
//
- // gv_qt005
+ // gv_qt005Name
//
- this.gv_qt005.AppearanceCell.Options.UseFont = true;
- this.gv_qt005.Caption = "鍒跺崟浜� ";
- this.gv_qt005.FieldName = "qt005";
- this.gv_qt005.MinWidth = 25;
- this.gv_qt005.Name = "gv_qt005";
- this.gv_qt005.OptionsColumn.AllowEdit = false;
- this.gv_qt005.Tag = "query_a.qt005";
- this.gv_qt005.Visible = true;
- this.gv_qt005.VisibleIndex = 7;
- this.gv_qt005.Width = 94;
+ this.gv_qt005Name.AppearanceCell.Options.UseFont = true;
+ this.gv_qt005Name.Caption = "鍒跺崟浜� ";
+ this.gv_qt005Name.FieldName = "qt005Name";
+ this.gv_qt005Name.MinWidth = 25;
+ this.gv_qt005Name.Name = "gv_qt005Name";
+ this.gv_qt005Name.OptionsColumn.AllowEdit = false;
+ this.gv_qt005Name.Tag = "query_a.qt005";
+ this.gv_qt005Name.Visible = true;
+ this.gv_qt005Name.VisibleIndex = 8;
+ this.gv_qt005Name.Width = 94;
//
// gv_qt001
//
@@ -434,7 +449,7 @@
this.gv_qt001.OptionsColumn.AllowEdit = false;
this.gv_qt001.Tag = "query_a.qt001";
this.gv_qt001.Visible = true;
- this.gv_qt001.VisibleIndex = 8;
+ this.gv_qt001.VisibleIndex = 9;
this.gv_qt001.Width = 180;
//
// gv_qt010
@@ -447,21 +462,21 @@
this.gv_qt010.OptionsColumn.AllowEdit = false;
this.gv_qt010.Tag = "query_a.qt010";
this.gv_qt010.Visible = true;
- this.gv_qt010.VisibleIndex = 9;
+ this.gv_qt010.VisibleIndex = 10;
this.gv_qt010.Width = 94;
//
- // gv_qt016
+ // gv_qt016Name
//
- this.gv_qt016.AppearanceCell.Options.UseFont = true;
- this.gv_qt016.Caption = "瀹℃牳浜� ";
- this.gv_qt016.FieldName = "qt016";
- this.gv_qt016.MinWidth = 25;
- this.gv_qt016.Name = "gv_qt016";
- this.gv_qt016.OptionsColumn.AllowEdit = false;
- this.gv_qt016.Tag = "query_a.qt016";
- this.gv_qt016.Visible = true;
- this.gv_qt016.VisibleIndex = 10;
- this.gv_qt016.Width = 94;
+ this.gv_qt016Name.AppearanceCell.Options.UseFont = true;
+ this.gv_qt016Name.Caption = "瀹℃牳浜� ";
+ this.gv_qt016Name.FieldName = "qt016Name";
+ this.gv_qt016Name.MinWidth = 25;
+ this.gv_qt016Name.Name = "gv_qt016Name";
+ this.gv_qt016Name.OptionsColumn.AllowEdit = false;
+ this.gv_qt016Name.Tag = "query_a.qt016";
+ this.gv_qt016Name.Visible = true;
+ this.gv_qt016Name.VisibleIndex = 11;
+ this.gv_qt016Name.Width = 94;
//
// gv_qt002
//
@@ -473,7 +488,7 @@
this.gv_qt002.OptionsColumn.AllowEdit = false;
this.gv_qt002.Tag = "query_a.qt002";
this.gv_qt002.Visible = true;
- this.gv_qt002.VisibleIndex = 11;
+ this.gv_qt002.VisibleIndex = 12;
this.gv_qt002.Width = 94;
//
// gridColumn5
@@ -483,7 +498,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 13;
+ this.gridColumn5.VisibleIndex = 17;
this.gridColumn5.Width = 94;
//
// gridColumn6
@@ -493,7 +508,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 14;
+ this.gridColumn6.VisibleIndex = 18;
this.gridColumn6.Width = 94;
//
// gridColumn13
@@ -505,7 +520,7 @@
this.gridColumn13.OptionsColumn.ReadOnly = true;
this.gridColumn13.Tag = "query_a.qt029";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 3;
+ this.gridColumn13.VisibleIndex = 4;
this.gridColumn13.Width = 94;
//
// gridColumn14
@@ -517,7 +532,7 @@
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Tag = "query_a.qt026";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 1;
+ this.gridColumn14.VisibleIndex = 2;
this.gridColumn14.Width = 94;
//
// gridColumn15
@@ -529,7 +544,7 @@
this.gridColumn15.OptionsColumn.ReadOnly = true;
this.gridColumn15.Tag = "query_a.qt032";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 2;
+ this.gridColumn15.VisibleIndex = 3;
this.gridColumn15.Width = 94;
//
// gridColumn20
@@ -539,8 +554,57 @@
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 5;
+ this.gridColumn20.VisibleIndex = 14;
this.gridColumn20.Width = 94;
+ //
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "鐢宠鍗旼uid";
+ this.gridColumn21.FieldName = "guid";
+ this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.OptionsColumn.ReadOnly = true;
+ this.gridColumn21.Width = 94;
+ //
+ // gridColumn22
+ //
+ this.gridColumn22.Caption = "璐т富";
+ this.gridColumn22.FieldName = "hzOrg";
+ this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.Visible = true;
+ this.gridColumn22.VisibleIndex = 16;
+ this.gridColumn22.Width = 94;
+ //
+ // gridColumn23
+ //
+ this.gridColumn23.Caption = "瀹岀粨鏍囪瘑";
+ this.gridColumn23.FieldName = "txtColor";
+ this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.Visible = true;
+ this.gridColumn23.VisibleIndex = 0;
+ this.gridColumn23.Width = 94;
+ //
+ // gridColumn24
+ //
+ this.gridColumn24.Caption = "棰嗙敤瀹㈡埛";
+ this.gridColumn24.FieldName = "khName";
+ this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.Name = "gridColumn24";
+ this.gridColumn24.Visible = true;
+ this.gridColumn24.VisibleIndex = 7;
+ this.gridColumn24.Width = 94;
+ //
+ // gridColumn25
+ //
+ this.gridColumn25.Caption = "棰嗙敤閮ㄩ棬";
+ this.gridColumn25.FieldName = "bmName";
+ this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.Name = "gridColumn25";
+ this.gridColumn25.Visible = true;
+ this.gridColumn25.VisibleIndex = 6;
+ this.gridColumn25.Width = 94;
//
// pageBar1
//
@@ -593,29 +657,30 @@
this.layoutMx1.Controls.Add(this.txt_qt013);
this.layoutMx1.Controls.Add(this.txt_qtck);
this.layoutMx1.Controls.Add(this.txt_qt019);
- this.layoutMx1.Controls.Add(this.txt_qt024);
this.layoutMx1.Controls.Add(this.txt_qt020);
this.layoutMx1.Controls.Add(this.txt_qt023);
- this.layoutMx1.Controls.Add(this.txt_qt016);
+ this.layoutMx1.Controls.Add(this.txt_qt016Name);
this.layoutMx1.Controls.Add(this.txt_qt002);
this.layoutMx1.Controls.Add(this.txt_qt015);
- this.layoutMx1.Controls.Add(this.txt_qt031);
+ this.layoutMx1.Controls.Add(this.txt_qt031Name);
this.layoutMx1.Controls.Add(this.txt_qt030);
this.layoutMx1.Controls.Add(this.txt_qt029);
- this.layoutMx1.Controls.Add(this.txt_qt028);
+ this.layoutMx1.Controls.Add(this.txt_qt028Name);
this.layoutMx1.Controls.Add(this.txt_qt027);
- this.layoutMx1.Controls.Add(this.txt_qt034);
+ this.layoutMx1.Controls.Add(this.txt_qt034Name);
this.layoutMx1.Controls.Add(this.txt_qt026);
this.layoutMx1.Controls.Add(this.txt_qt033);
this.layoutMx1.Controls.Add(this.txt_qt032);
this.layoutMx1.Controls.Add(this.txt_qt035);
this.layoutMx1.Controls.Add(this.txt_qtlx);
+ this.layoutMx1.Controls.Add(this.txt_lyRemark);
+ this.layoutMx1.Controls.Add(this.btnDown);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem14});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(722, 358, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(552, 530, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(1126, 233);
this.layoutMx1.TabIndex = 0;
@@ -624,16 +689,16 @@
// txt_wwgys
//
this.txt_wwgys.IsReadly = false;
- this.txt_wwgys.Location = new System.Drawing.Point(385, 198);
+ this.txt_wwgys.Location = new System.Drawing.Point(387, 165);
this.txt_wwgys.Margin = new System.Windows.Forms.Padding(0);
this.txt_wwgys.Name = "txt_wwgys";
- this.txt_wwgys.Size = new System.Drawing.Size(165, 24);
+ this.txt_wwgys.Size = new System.Drawing.Size(173, 24);
this.txt_wwgys.TabIndex = 446;
//
// btnCopyXls
//
this.btnCopyXls.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCopyXls.ImageOptions.Image")));
- this.btnCopyXls.Location = new System.Drawing.Point(12, 198);
+ this.btnCopyXls.Location = new System.Drawing.Point(10, 196);
this.btnCopyXls.Name = "btnCopyXls";
this.btnCopyXls.Size = new System.Drawing.Size(116, 27);
this.btnCopyXls.StyleController = this.layoutMx1;
@@ -653,44 +718,46 @@
//
this.ucLookHuoZhu1.HzId = null;
this.ucLookHuoZhu1.IsReadly = false;
- this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 74);
+ this.ucLookHuoZhu1.Location = new System.Drawing.Point(10, 72);
this.ucLookHuoZhu1.Margin = new System.Windows.Forms.Padding(0);
this.ucLookHuoZhu1.Name = "ucLookHuoZhu1";
this.ucLookHuoZhu1.OrgId = null;
- this.ucLookHuoZhu1.Size = new System.Drawing.Size(267, 58);
+ this.ucLookHuoZhu1.Size = new System.Drawing.Size(273, 58);
this.ucLookHuoZhu1.TabIndex = 318;
//
// txt_qt010
//
- this.txt_qt010.Location = new System.Drawing.Point(114, 136);
+ this.txt_qt010.Location = new System.Drawing.Point(110, 134);
this.txt_qt010.Name = "txt_qt010";
this.txt_qt010.Properties.Appearance.Options.UseFont = true;
- this.txt_qt010.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt010.Size = new System.Drawing.Size(173, 24);
this.txt_qt010.StyleController = this.layoutMx1;
this.txt_qt010.TabIndex = 235;
//
// txt_qt009
//
this.txt_qt009.IsReadly = false;
- this.txt_qt009.Location = new System.Drawing.Point(385, 136);
+ this.txt_qt009.Location = new System.Drawing.Point(387, 103);
+ this.txt_qt009.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt009.Name = "txt_qt009";
- this.txt_qt009.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt009.Size = new System.Drawing.Size(173, 24);
this.txt_qt009.TabIndex = 316;
//
// txt_qt013
//
this.txt_qt013.IsReadly = false;
- this.txt_qt013.Location = new System.Drawing.Point(385, 105);
+ this.txt_qt013.Location = new System.Drawing.Point(387, 72);
+ this.txt_qt013.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt013.Name = "txt_qt013";
- this.txt_qt013.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt013.Size = new System.Drawing.Size(173, 24);
this.txt_qt013.TabIndex = 304;
//
// txt_qtck
//
- this.txt_qtck.Location = new System.Drawing.Point(114, 12);
+ this.txt_qtck.Location = new System.Drawing.Point(110, 10);
this.txt_qtck.Name = "txt_qtck";
this.txt_qtck.Properties.Appearance.Options.UseFont = true;
- this.txt_qtck.Size = new System.Drawing.Size(165, 24);
+ this.txt_qtck.Size = new System.Drawing.Size(173, 24);
this.txt_qtck.StyleController = this.layoutMx1;
this.txt_qtck.TabIndex = 211;
this.txt_qtck.Tag = "readonly";
@@ -698,7 +765,7 @@
// txt_qt019
//
this.txt_qt019.EditValue = "鏍囧噯鍏朵粬鍑哄簱鍗�(QTCKD01_SYS)";
- this.txt_qt019.Location = new System.Drawing.Point(385, 12);
+ this.txt_qt019.Location = new System.Drawing.Point(387, 10);
this.txt_qt019.Name = "txt_qt019";
this.txt_qt019.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -709,22 +776,14 @@
"璐圭敤鐗╂枡鍑哄簱(QTCKD04_SYS)",
"搴撳瓨璋冩暣(QTCKD05_SYS)"});
this.txt_qt019.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qt019.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt019.Size = new System.Drawing.Size(173, 24);
this.txt_qt019.StyleController = this.layoutMx1;
this.txt_qt019.TabIndex = 301;
- //
- // txt_qt024
- //
- this.txt_qt024.IsReadly = false;
- this.txt_qt024.Location = new System.Drawing.Point(385, 43);
- this.txt_qt024.Name = "txt_qt024";
- this.txt_qt024.Size = new System.Drawing.Size(165, 24);
- this.txt_qt024.TabIndex = 309;
//
// txt_qt020
//
this.txt_qt020.EditValue = "鏅��(GENERAL)";
- this.txt_qt020.Location = new System.Drawing.Point(385, 74);
+ this.txt_qt020.Location = new System.Drawing.Point(387, 41);
this.txt_qt020.Name = "txt_qt020";
this.txt_qt020.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -732,146 +791,147 @@
"鏅��(GENERAL)",
"閫�璐�(RETURN)"});
this.txt_qt020.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qt020.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt020.Size = new System.Drawing.Size(173, 24);
this.txt_qt020.StyleController = this.layoutMx1;
this.txt_qt020.TabIndex = 300;
//
// txt_qt023
//
this.txt_qt023.IsReadly = false;
- this.txt_qt023.Location = new System.Drawing.Point(114, 43);
+ this.txt_qt023.Location = new System.Drawing.Point(110, 41);
+ this.txt_qt023.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt023.Name = "txt_qt023";
- this.txt_qt023.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt023.Size = new System.Drawing.Size(173, 24);
this.txt_qt023.TabIndex = 307;
//
- // txt_qt016
+ // txt_qt016Name
//
- this.txt_qt016.Location = new System.Drawing.Point(927, 12);
- this.txt_qt016.Name = "txt_qt016";
- this.txt_qt016.Properties.Appearance.Options.UseFont = true;
- this.txt_qt016.Size = new System.Drawing.Size(166, 24);
- this.txt_qt016.StyleController = this.layoutMx1;
- this.txt_qt016.TabIndex = 262;
- this.txt_qt016.Tag = "readonly";
+ this.txt_qt016Name.Location = new System.Drawing.Point(941, 10);
+ this.txt_qt016Name.Name = "txt_qt016Name";
+ this.txt_qt016Name.Properties.Appearance.Options.UseFont = true;
+ this.txt_qt016Name.Size = new System.Drawing.Size(175, 24);
+ this.txt_qt016Name.StyleController = this.layoutMx1;
+ this.txt_qt016Name.TabIndex = 262;
+ this.txt_qt016Name.Tag = "readonly";
//
// txt_qt002
//
- this.txt_qt002.Location = new System.Drawing.Point(927, 43);
+ this.txt_qt002.Location = new System.Drawing.Point(941, 41);
this.txt_qt002.Name = "txt_qt002";
this.txt_qt002.Properties.Appearance.Options.UseFont = true;
- this.txt_qt002.Size = new System.Drawing.Size(166, 24);
+ this.txt_qt002.Size = new System.Drawing.Size(175, 24);
this.txt_qt002.StyleController = this.layoutMx1;
this.txt_qt002.TabIndex = 216;
this.txt_qt002.Tag = "readonly";
//
// txt_qt015
//
- this.txt_qt015.Location = new System.Drawing.Point(825, 74);
+ this.txt_qt015.Location = new System.Drawing.Point(841, 72);
this.txt_qt015.Name = "txt_qt015";
this.txt_qt015.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_qt015.Size = new System.Drawing.Size(268, 24);
+ this.txt_qt015.Size = new System.Drawing.Size(275, 24);
this.txt_qt015.StyleController = this.layoutMx1;
this.txt_qt015.TabIndex = 310;
this.txt_qt015.Tag = "readonly";
//
- // txt_qt031
+ // txt_qt031Name
//
- this.txt_qt031.Location = new System.Drawing.Point(927, 105);
- this.txt_qt031.Name = "txt_qt031";
- this.txt_qt031.Size = new System.Drawing.Size(166, 24);
- this.txt_qt031.StyleController = this.layoutMx1;
- this.txt_qt031.TabIndex = 321;
- this.txt_qt031.Tag = "readonly";
+ this.txt_qt031Name.Location = new System.Drawing.Point(941, 103);
+ this.txt_qt031Name.Name = "txt_qt031Name";
+ this.txt_qt031Name.Size = new System.Drawing.Size(175, 24);
+ this.txt_qt031Name.StyleController = this.layoutMx1;
+ this.txt_qt031Name.TabIndex = 321;
+ this.txt_qt031Name.Tag = "readonly";
//
// txt_qt030
//
- this.txt_qt030.Location = new System.Drawing.Point(927, 136);
+ this.txt_qt030.Location = new System.Drawing.Point(941, 134);
this.txt_qt030.Name = "txt_qt030";
- this.txt_qt030.Size = new System.Drawing.Size(166, 24);
+ this.txt_qt030.Size = new System.Drawing.Size(175, 24);
this.txt_qt030.StyleController = this.layoutMx1;
this.txt_qt030.TabIndex = 322;
this.txt_qt030.Tag = "readonly";
//
// txt_qt029
//
- this.txt_qt029.Location = new System.Drawing.Point(825, 167);
+ this.txt_qt029.Location = new System.Drawing.Point(841, 165);
this.txt_qt029.Name = "txt_qt029";
this.txt_qt029.Properties.Caption = "璐㈠姟瀹℃牳鐘舵��";
- this.txt_qt029.Size = new System.Drawing.Size(268, 24);
+ this.txt_qt029.Size = new System.Drawing.Size(275, 24);
this.txt_qt029.StyleController = this.layoutMx1;
this.txt_qt029.TabIndex = 323;
this.txt_qt029.Tag = "readonly";
//
- // txt_qt028
+ // txt_qt028Name
//
- this.txt_qt028.Location = new System.Drawing.Point(656, 105);
- this.txt_qt028.Name = "txt_qt028";
- this.txt_qt028.Size = new System.Drawing.Size(165, 24);
- this.txt_qt028.StyleController = this.layoutMx1;
- this.txt_qt028.TabIndex = 324;
- this.txt_qt028.Tag = "readonly";
+ this.txt_qt028Name.Location = new System.Drawing.Point(664, 103);
+ this.txt_qt028Name.Name = "txt_qt028Name";
+ this.txt_qt028Name.Size = new System.Drawing.Size(173, 24);
+ this.txt_qt028Name.StyleController = this.layoutMx1;
+ this.txt_qt028Name.TabIndex = 324;
+ this.txt_qt028Name.Tag = "readonly";
//
// txt_qt027
//
- this.txt_qt027.Location = new System.Drawing.Point(656, 136);
+ this.txt_qt027.Location = new System.Drawing.Point(664, 134);
this.txt_qt027.Name = "txt_qt027";
- this.txt_qt027.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt027.Size = new System.Drawing.Size(173, 24);
this.txt_qt027.StyleController = this.layoutMx1;
this.txt_qt027.TabIndex = 325;
this.txt_qt027.Tag = "readonly";
//
- // txt_qt034
+ // txt_qt034Name
//
- this.txt_qt034.Location = new System.Drawing.Point(656, 12);
- this.txt_qt034.Name = "txt_qt034";
- this.txt_qt034.Size = new System.Drawing.Size(165, 24);
- this.txt_qt034.StyleController = this.layoutMx1;
- this.txt_qt034.TabIndex = 326;
- this.txt_qt034.Tag = "readonly";
+ this.txt_qt034Name.Location = new System.Drawing.Point(664, 10);
+ this.txt_qt034Name.Name = "txt_qt034Name";
+ this.txt_qt034Name.Size = new System.Drawing.Size(173, 24);
+ this.txt_qt034Name.StyleController = this.layoutMx1;
+ this.txt_qt034Name.TabIndex = 326;
+ this.txt_qt034Name.Tag = "readonly";
//
// txt_qt026
//
- this.txt_qt026.Location = new System.Drawing.Point(554, 167);
+ this.txt_qt026.Location = new System.Drawing.Point(564, 165);
this.txt_qt026.Name = "txt_qt026";
this.txt_qt026.Properties.Caption = "鍞悗瀹℃牳鏍囪瘑";
- this.txt_qt026.Size = new System.Drawing.Size(267, 24);
+ this.txt_qt026.Size = new System.Drawing.Size(273, 24);
this.txt_qt026.StyleController = this.layoutMx1;
this.txt_qt026.TabIndex = 327;
this.txt_qt026.Tag = "readonly";
//
// txt_qt033
//
- this.txt_qt033.Location = new System.Drawing.Point(656, 43);
+ this.txt_qt033.Location = new System.Drawing.Point(664, 41);
this.txt_qt033.Name = "txt_qt033";
- this.txt_qt033.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt033.Size = new System.Drawing.Size(173, 24);
this.txt_qt033.StyleController = this.layoutMx1;
this.txt_qt033.TabIndex = 328;
this.txt_qt033.Tag = "readonly";
//
// txt_qt032
//
- this.txt_qt032.Location = new System.Drawing.Point(554, 74);
+ this.txt_qt032.Location = new System.Drawing.Point(564, 72);
this.txt_qt032.Name = "txt_qt032";
this.txt_qt032.Properties.Caption = "閲囪喘瀹℃牳鏍囪瘑";
- this.txt_qt032.Size = new System.Drawing.Size(267, 24);
+ this.txt_qt032.Size = new System.Drawing.Size(273, 24);
this.txt_qt032.StyleController = this.layoutMx1;
this.txt_qt032.TabIndex = 329;
this.txt_qt032.Tag = "readonly";
//
// txt_qt035
//
- this.txt_qt035.Location = new System.Drawing.Point(114, 167);
+ this.txt_qt035.Location = new System.Drawing.Point(110, 165);
this.txt_qt035.Name = "txt_qt035";
this.txt_qt035.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton()});
- this.txt_qt035.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt035.Size = new System.Drawing.Size(173, 24);
this.txt_qt035.StyleController = this.layoutMx1;
this.txt_qt035.TabIndex = 330;
//
// txt_qtlx
//
this.txt_qtlx.EditValue = "璇烽�夋嫨";
- this.txt_qtlx.Location = new System.Drawing.Point(385, 167);
+ this.txt_qtlx.Location = new System.Drawing.Point(387, 134);
this.txt_qtlx.Name = "txt_qtlx";
this.txt_qtlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -883,11 +943,22 @@
"4:瀹㈡埛璧犻��",
"5:鎶ュ簾鍑哄簱",
"6:鏍锋満鍑哄簱",
- "7:鏃犳簮鍗曞澶栭��鏂�"});
+ "7:鏃犳簮鍗曞澶栭��鏂�",
+ "8:鐩樹簭",
+ "9:宸ュ崟瀹屾垚鍚庨��鎹㈡枡"});
this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qtlx.Size = new System.Drawing.Size(165, 24);
+ this.txt_qtlx.Size = new System.Drawing.Size(173, 24);
this.txt_qtlx.StyleController = this.layoutMx1;
this.txt_qtlx.TabIndex = 331;
+ //
+ // txt_lyRemark
+ //
+ this.txt_lyRemark.Location = new System.Drawing.Point(664, 196);
+ this.txt_lyRemark.Name = "txt_lyRemark";
+ this.txt_lyRemark.Size = new System.Drawing.Size(452, 27);
+ this.txt_lyRemark.StyleController = this.layoutMx1;
+ this.txt_lyRemark.TabIndex = 447;
+ this.txt_lyRemark.Tag = "readonly";
//
// layoutControlItem14
//
@@ -919,18 +990,19 @@
this.layoutControlItem19,
this.layoutControlItem21,
this.layoutControlItem20,
- this.layoutControlItem3,
- this.layoutControlItem11,
this.layoutControlItem22,
this.layoutControlItem23,
- this.layoutControlItem10,
- this.layoutControlItem5,
this.layoutControlItem13,
this.layoutControlItem24,
- this.layoutControlItem12,
this.layoutControlItem1,
this.layoutControlItem25,
- this.layItemWwgys});
+ this.layoutControlItem3,
+ this.layoutControlItem10,
+ this.layoutControlItem11,
+ this.layoutControlItem12,
+ this.layItemWwgys,
+ this.txt_lyRemarklb,
+ this.layoutControlItem5});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -968,16 +1040,16 @@
rowDefinition5,
rowDefinition6,
rowDefinition7});
- this.Root.Size = new System.Drawing.Size(1105, 237);
+ this.Root.Size = new System.Drawing.Size(1126, 233);
this.Root.TextVisible = false;
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_qt019;
- this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(277, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
@@ -987,39 +1059,39 @@
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(271, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem4.Text = "搴撳瓨缁勭粐";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
- this.layoutControlItem6.Control = this.txt_qt016;
- this.layoutControlItem6.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem6.Control = this.txt_qt016Name;
+ this.layoutControlItem6.Location = new System.Drawing.Point(831, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(279, 31);
this.layoutControlItem6.Text = "瀹℃牳浜哄憳";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_qt002;
- this.layoutControlItem7.Location = new System.Drawing.Point(813, 31);
+ this.layoutControlItem7.Location = new System.Drawing.Point(831, 31);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(279, 31);
this.layoutControlItem7.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_qt015;
- this.layoutControlItem8.Location = new System.Drawing.Point(813, 62);
+ this.layoutControlItem8.Location = new System.Drawing.Point(831, 62);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(279, 31);
this.layoutControlItem8.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
@@ -1031,155 +1103,111 @@
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 62);
+ this.layoutControlItem9.Size = new System.Drawing.Size(277, 62);
this.layoutControlItem9.Text = "璐т富绫诲瀷";
this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem9.TextVisible = false;
//
// layoutControlItem15
//
- this.layoutControlItem15.Control = this.txt_qt031;
- this.layoutControlItem15.Location = new System.Drawing.Point(813, 93);
+ this.layoutControlItem15.Control = this.txt_qt031Name;
+ this.layoutControlItem15.Location = new System.Drawing.Point(831, 93);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(279, 31);
this.layoutControlItem15.Text = "璐㈠姟瀹℃牳浜哄憳";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_qt030;
- this.layoutControlItem16.Location = new System.Drawing.Point(813, 124);
+ this.layoutControlItem16.Location = new System.Drawing.Point(831, 124);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem16.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem16.Size = new System.Drawing.Size(279, 31);
this.layoutControlItem16.Text = "璐㈠姟瀹℃牳鏃堕棿";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_qt029;
- this.layoutControlItem17.Location = new System.Drawing.Point(813, 155);
+ this.layoutControlItem17.Location = new System.Drawing.Point(831, 155);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem17.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem17.Size = new System.Drawing.Size(279, 31);
this.layoutControlItem17.Text = "璐㈠姟瀹℃牳鏍囪瘑";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
//
// layoutControlItem18
//
- this.layoutControlItem18.Control = this.txt_qt028;
- this.layoutControlItem18.Location = new System.Drawing.Point(542, 93);
+ this.layoutControlItem18.Control = this.txt_qt028Name;
+ this.layoutControlItem18.Location = new System.Drawing.Point(554, 93);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem18.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem18.Text = "鍞悗瀹℃牳浜哄憳";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_qt027;
- this.layoutControlItem19.Location = new System.Drawing.Point(542, 124);
+ this.layoutControlItem19.Location = new System.Drawing.Point(554, 124);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem19.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem19.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem19.Text = "鍞悗瀹℃牳鏃堕棿";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_qt026;
- this.layoutControlItem21.Location = new System.Drawing.Point(542, 155);
+ this.layoutControlItem21.Location = new System.Drawing.Point(554, 155);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem21.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem21.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem21.Text = "鍞悗瀹℃牳鏍囪瘑";
this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem21.TextVisible = false;
//
// layoutControlItem20
//
- this.layoutControlItem20.Control = this.txt_qt034;
- this.layoutControlItem20.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem20.Control = this.txt_qt034Name;
+ this.layoutControlItem20.Location = new System.Drawing.Point(554, 0);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem20.Text = "閲囪喘瀹℃牳浜哄憳";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_qt020;
- this.layoutControlItem3.Location = new System.Drawing.Point(271, 62);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_qt009;
- this.layoutControlItem11.Location = new System.Drawing.Point(271, 124);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem11.Text = "棰嗘枡閮ㄩ棬";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_qt033;
- this.layoutControlItem22.Location = new System.Drawing.Point(542, 31);
+ this.layoutControlItem22.Location = new System.Drawing.Point(554, 31);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem22.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem22.Text = "閲囪喘瀹℃牳鏃堕棿";
this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_qt032;
- this.layoutControlItem23.Location = new System.Drawing.Point(542, 62);
+ this.layoutControlItem23.Location = new System.Drawing.Point(554, 62);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem23.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem23.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem23.Text = "閲囪喘瀹℃牳鏍囪瘑";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_qt013;
- this.layoutControlItem10.Location = new System.Drawing.Point(271, 93);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem10.Text = "瀹㈡埛";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_qt024;
- 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(271, 31);
- this.layoutControlItem5.Text = "棰嗙敤缁勭粐";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem13
//
@@ -1187,7 +1215,7 @@
this.layoutControlItem13.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem13.Text = "鐢宠澶囨敞";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1197,27 +1225,16 @@
this.layoutControlItem24.Location = new System.Drawing.Point(0, 155);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem24.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem24.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem24.Text = "鏉ユ簮鍗曞彿";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_qtlx;
- this.layoutControlItem12.Location = new System.Drawing.Point(271, 155);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem12.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem12.Text = "鍑哄簱绫诲瀷";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_qtck;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem1.Text = "鍗曟嵁缂栧彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1229,22 +1246,66 @@
this.layoutControlItem25.MinSize = new System.Drawing.Size(90, 31);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem25.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem25.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem25.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem25.Text = "蹇嵎褰曞叆";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_qt020;
+ this.layoutControlItem3.Location = new System.Drawing.Point(277, 31);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_qt013;
+ this.layoutControlItem10.Location = new System.Drawing.Point(277, 62);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem10.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem10.Text = "瀹㈡埛";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_qt009;
+ this.layoutControlItem11.Location = new System.Drawing.Point(277, 93);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem11.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem11.Text = "棰嗘枡閮ㄩ棬";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_qtlx;
+ this.layoutControlItem12.Location = new System.Drawing.Point(277, 124);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem12.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem12.Text = "鍑哄簱绫诲瀷";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// layItemWwgys
//
this.layItemWwgys.AppearanceItemCaption.ForeColor = System.Drawing.Color.Blue;
this.layItemWwgys.AppearanceItemCaption.Options.UseForeColor = true;
this.layItemWwgys.Control = this.txt_wwgys;
- this.layItemWwgys.Location = new System.Drawing.Point(271, 186);
+ this.layItemWwgys.Location = new System.Drawing.Point(277, 155);
this.layItemWwgys.Name = "layItemWwgys";
this.layItemWwgys.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layItemWwgys.OptionsTableLayoutItem.RowIndex = 6;
- this.layItemWwgys.Size = new System.Drawing.Size(271, 31);
+ this.layItemWwgys.OptionsTableLayoutItem.RowIndex = 5;
+ this.layItemWwgys.Size = new System.Drawing.Size(277, 31);
this.layItemWwgys.Text = "濮斿渚涘簲鍟�";
this.layItemWwgys.TextSize = new System.Drawing.Size(90, 18);
this.layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
@@ -1618,6 +1679,43 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // txt_lyRemarklb
+ //
+ this.txt_lyRemarklb.Control = this.txt_lyRemark;
+ this.txt_lyRemarklb.Location = new System.Drawing.Point(554, 186);
+ this.txt_lyRemarklb.Name = "txt_lyRemarklb";
+ this.txt_lyRemarklb.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.txt_lyRemarklb.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.txt_lyRemarklb.OptionsTableLayoutItem.RowIndex = 6;
+ this.txt_lyRemarklb.Size = new System.Drawing.Size(556, 31);
+ this.txt_lyRemarklb.Text = "棰嗙敤缁煎悎淇℃伅";
+ this.txt_lyRemarklb.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // btnDown
+ //
+ this.btnDown.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.copy_16x16;
+ this.btnDown.Location = new System.Drawing.Point(287, 196);
+ this.btnDown.Name = "btnDown";
+ this.btnDown.Size = new System.Drawing.Size(196, 27);
+ this.btnDown.StyleController = this.layoutMx1;
+ this.btnDown.TabIndex = 448;
+ this.btnDown.Text = "鍚戜笅澶嶅埗浠撳簱";
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.btnDown;
+ this.layoutControlItem5.Location = new System.Drawing.Point(277, 186);
+ this.layoutControlItem5.MaxSize = new System.Drawing.Size(200, 31);
+ this.layoutControlItem5.MinSize = new System.Drawing.Size(96, 31);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem5.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem5.Text = "澶嶅埗浠撳簱";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem5.TextVisible = false;
+ //
// Frm_MesItemQt
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1651,20 +1749,21 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qtck.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt020.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt016.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt016Name.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt002.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt031.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt031Name.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt028Name.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt027.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt034Name.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt026.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qtlx.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lyRemark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1680,17 +1779,16 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItemWwgys)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
@@ -1702,11 +1800,13 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptCk)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lyRemarklb)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
this.ResumeLayout(false);
}
#endregion
- private UserControl.UcToolBarMenu toolBarMenu1;
+ private UserControl.UcToolBarMenu toolBarMenu1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
@@ -1719,10 +1819,10 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gv_qt020;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt005;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt005Name;
private DevExpress.XtraGrid.Columns.GridColumn gv_qt001;
private DevExpress.XtraGrid.Columns.GridColumn gv_qt010;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt016;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt016Name;
private DevExpress.XtraGrid.Columns.GridColumn gv_qt002;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
@@ -1731,13 +1831,12 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private UserControl.UcLookHuoZhu ucLookHuoZhu1;
private UserControl.UcLookDepartment txt_qt009;
- private UserControl.UcLookOrg txt_qt024;
private UserControl.UcLookOrg txt_qt023;
private UserControl.UcLookCustomer txt_qt013;
private DevExpress.XtraEditors.ComboBoxEdit txt_qt019;
private DevExpress.XtraEditors.ComboBoxEdit txt_qt020;
private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.TextEdit txt_qt016;
+ private DevExpress.XtraEditors.TextEdit txt_qt016Name;
private DevExpress.XtraEditors.TextEdit txt_qt010;
private DevExpress.XtraEditors.TextEdit txt_qt002;
private DevExpress.XtraEditors.TextEdit txt_qtck;
@@ -1780,15 +1879,15 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
- private DevExpress.XtraEditors.TextEdit txt_qt031;
+ private DevExpress.XtraEditors.TextEdit txt_qt031Name;
private DevExpress.XtraEditors.TextEdit txt_qt030;
private DevExpress.XtraEditors.CheckEdit txt_qt029;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraEditors.TextEdit txt_qt028;
+ private DevExpress.XtraEditors.TextEdit txt_qt028Name;
private DevExpress.XtraEditors.TextEdit txt_qt027;
- private DevExpress.XtraEditors.TextEdit txt_qt034;
+ private DevExpress.XtraEditors.TextEdit txt_qt034Name;
private DevExpress.XtraEditors.CheckEdit txt_qt026;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
@@ -1796,20 +1895,15 @@
private DevExpress.XtraEditors.TextEdit txt_qt033;
private DevExpress.XtraEditors.CheckEdit txt_qt032;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private DevExpress.XtraEditors.ButtonEdit txt_qt035;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptCk;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraEditors.ComboBoxEdit txt_qtlx;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraEditors.SimpleButton btnCopyXls;
@@ -1817,6 +1911,19 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private UserControl.UcLookSupplier txt_wwgys;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+ private DevExpress.XtraEditors.MemoEdit txt_lyRemark;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layItemWwgys;
+ private DevExpress.XtraEditors.SimpleButton btnDown;
+ private DevExpress.XtraLayout.LayoutControlItem txt_lyRemarklb;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index 41a19c8..ee3e5ba 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -41,12 +41,14 @@
toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick;
toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick;
toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick;
+ toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
+ toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isChk", "", (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);
@@ -65,49 +67,76 @@
ucLookHuoZhu1.OrgId = _orgId;
ucLookHuoZhu1.HzId = _ucHz;
ucLookHuoZhu1.SetHzLx(_ucHzlx);
- System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
- sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'");
- var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
- var json = JsonConvert.SerializeObject(_obj);
- try
- {
- var strReturn = UtilityHelper.HttpPost("", "MesItemsManager/GetListSelect", json);
- var rtn = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = rtn.rtnData.list;
- this.repositoryItemSearchLookUpEdit1.DataSource = dt;
- // repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
- //repositoryItemSearchLookUpEdit1.PopupFormSize = new System.Drawing.Size(500, 300);
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
- }
- };
- //閫夋嫨棰嗙敤缁勭粐
- txt_qt024.EditChanged += (s, e) =>
- {
- string _orgId = txt_qt024.GetId();
- if (string.IsNullOrEmpty(_orgId))
- return;
+ ucLookHuoZhu1.SetHzId(_ucHz);
+ _bindLookSearch(txt_qt035.Text.Trim(), "", "");
txt_qt013.getSuppler(_orgId, _ucKh);
- txt_qt009.getSuppler(_orgId, _ucBm);
+ txt_qt009.getSuppler(_orgId, _ucBm, " len(a.departmentcode)>2 ");
txt_wwgys.getSuppler(_orgId, _ucGys);
};
+ //閫夋嫨棰嗙敤缁勭粐2025骞�-10-24宸茶绂佺敤锛屼负鑰冭檻鎬ц兘锛屽垹闄�
+ //txt_qt024.EditChanged += (s, e) =>
+ //{
+ // string _orgId = txt_qt024.GetId();
+ // if (string.IsNullOrEmpty(_orgId))
+ // return;
+ // txt_qt013.getSuppler(_orgId, _ucKh);
+ // txt_qt009.getSuppler(_orgId, _ucBm);
+ // txt_wwgys.getSuppler(_orgId, _ucGys);
+ //};
//閫夋嫨鏉ユ簮鍗曞彿
txt_qt035.ButtonClick += (s, e) =>
{
- string strSrmNo = "";
- SelectDaa frm = new SelectDaa();
+ string _orgId = txt_qt023.GetId();
+ SelectDaa frm = new SelectDaa(_orgId);
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<dynamic>();
lst = ee.DynamicList;
- strSrmNo = lst[0].guid;
+ string strSrmNo = lst[0].guid;
+ string strGdlx = lst[0].gdlx;
+ string strGdlxWlid = lst[0].gdlxWlid;
txt_qt035.Text = strSrmNo;
+ _bindLookSearch(txt_qt035.Text.Trim(), strGdlx, strGdlxWlid);
+ #region 閫夋嫨宸ュ崟鍚庡甫鍑轰笅闈㈢殑鐗╂枡 2025-09-27
+ //try
+ //{
+ // var _obj = new
+ // {
+ // strDaaNo = strSrmNo,//涓诲缓
+ // };
+ // var strReturn = UtilityHelper.HttpPost("",
+ // "WomdaaManager/SelectDaaMx",
+ // JsonConvert.SerializeObject(_obj));
+ // var dt = UtilityHelper.ReturnToList(strReturn);
+ // DataTable _newTable = dt.rtnData;
+ // DataTable _oldTable = (DataTable)gcMx1.DataSource;
+ // foreach (DataRow dddddd in _newTable.Rows)
+ // {
+ // DataRow _row = _oldTable.NewRow();
+ // _row["qd002"] = dddddd["itemNo"].ToString();
+ // _row["qd003"] = dddddd["itemName"].ToString();
+ // _row["qd004"] = dddddd["itemModel"].ToString();
+ // _row["qd009dw"] = dddddd["dwName"].ToString();
+ // _row["itemId"] = dddddd["itemId"].ToString();
+ // _row["depotName"] = dddddd["depotName"].ToString();
+ // _row["depotId"] = dddddd["depotId"].ToString();
+ // _row["kcQty"] = dddddd["kcQty"].ToString();
+ // _oldTable.Rows.Add(_row);
+ // }
+ // gcMx1.BindingContext = new BindingContext();
+ // gcMx1.DataSource = _oldTable;
+ // gcMx1.ForceInitialize();
+ // gvMx1.BestFitColumns();
+ // Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+ //}
+ //catch (Exception ex)
+ //{
+ // MessageBox.Show(ex.Message);
+ //}
+ #endregion
};
frm.ShowDialog();
};
-
#region 2025-08-27 澶嶅埗beg
btnCopyXls.Click += (s, e) =>
{
@@ -181,6 +210,99 @@
}
};
#endregion
+
+ #region 2025-10-10 鍚戜笅澶嶅埗beg
+ btnDown.Click += (s, e) =>
+ {
+ // 鑾峰彇褰撳墠閫変腑琛岀殑琛屽彿
+ int focusedRowHandle = gvMx1.FocusedRowHandle;
+ if (focusedRowHandle < 0) return;
+
+ // 鑾峰彇褰撳墠琛岀殑鏃堕暱
+ DataRow currentRow = gvMx1.GetDataRow(focusedRowHandle);
+ if (currentRow == null) return;
+ var hourValue = currentRow["depotId"];
+ var hourValue2 = currentRow["depotName"];
+ if (hourValue == null || string.IsNullOrEmpty(hourValue.ToString()))
+ {
+ MsgHelper.ShowError("褰撳墠閫変腑鐨勮鏃犱粨搴擄紝澶嶅埗澶辫触锛�");
+ return;
+ }
+ if (hourValue2 == null)
+ {
+ MsgHelper.ShowError("褰撳墠閫変腑鐨勮鏃犱粨搴擄紝澶嶅埗澶辫触锛�");
+ return;
+ }
+ // 鎵归噺璁剧疆涓嬮潰鎵�鏈夎鐨勬椂闀�
+ for (int i = focusedRowHandle + 1; i < gvMx1.DataRowCount; i++)
+ {
+ var row = gvMx1.GetDataRow(i);
+ if (row != null)
+ {
+ row["depotId"] = hourValue;
+ row["depotName"] = hourValue2;
+ }
+ }
+ gvMx1.RefreshData();
+ };
+ #endregion
+ }
+
+
+
+ /// <summary>
+ /// 鏉ユ簮鏄庣粏闄愬埗锛�
+ /// </summary>
+ /// <param name="strGdlx">宸ュ崟绫诲瀷锛屽鏋滄槸缁翠慨锛屾牴鎹墿鏂欐壘</param>
+ private void _bindLookSearch(string daaNo, string strGdlx, string gdlxWlid)
+ {
+ System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
+ sbWhere.Append(" and a.FSubsidiary ='" + txt_qt023.GetId() + "'");
+ if (daaNo.Trim().Length > 0)
+ {
+ if (strGdlx == "W-缁翠慨杩斿伐" || strGdlx == "C-鎷嗘満杩斿伐")
+ {
+ sbWhere.Append(" and a.item_id in (");
+ sbWhere.Append(" select dab.dab003 from WOMDAA daa left join WOMDAB dab on daa.guid=dab.daaGuid ");
+ sbWhere.Append(" where daa.guid=( select top 1 ddddd.guid as dddddGuid from WOMDAA ddddd where ddddd.daa002='" + gdlxWlid + "' and ddddd.daa025 in('F-閲忎骇','S-璇曚骇') order by ddddd.daa001 desc )");
+ sbWhere.Append(" )");
+ }
+ else
+ {
+ sbWhere.Append(" and a.item_id in (");
+ sbWhere.Append(" select dab.dab003 from WOMDAB dab where dab.dab001 = '" + txt_qt035.Text.Trim() + "'");
+ sbWhere.Append(" )");
+ }
+ }
+ var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
+ var json = JsonConvert.SerializeObject(_obj);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "MesItemsManager/GetListSelect", json);
+ var rtn = UtilityHelper.ReturnToTablePage(strReturn);
+ DataTable dt = rtn.rtnData.list;
+ //濡傛灉娌℃湁锛屽啀璇讳竴閬�
+ if (dt == null || dt.Rows.Count <= 1)
+ {
+ _bindLookSearch("", "", "");
+ }
+ else
+ {
+ this.gridView2.IndicatorWidth = 60;
+ this.gridView2.CustomDrawRowIndicator += (ss, ee) =>
+ {
+ if (ee.Info.IsRowIndicator && ee.RowHandle >= 0)
+ ee.Info.DisplayText = (ee.RowHandle + 1).ToString();
+ };
+ this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+ // repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+ //repositoryItemSearchLookUpEdit1.PopupFormSize = new System.Drawing.Size(500, 300);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -341,7 +463,7 @@
}
//2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
txt_qt023.IsReadly = true;
- txt_qt024.IsReadly = true;
+ //txt_qt024.IsReadly = true;
ucLookHuoZhu1.Enabled = false;
}
/// <summary>
@@ -360,7 +482,7 @@
ucLookHuoZhu1.Enabled = true;
//澧炲姞鏃讹紝榛樿缁勭粐
string deftOrg = UtilityHelper.GetFirstOrg(txt_qt023);
- string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024);
+ //string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024);
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -375,7 +497,8 @@
string inHz = ucLookHuoZhu1.GetHzId();//璐т富
string inRkyy = txt_qt010.Text.Trim();//鍘熷洜
string inDjlx = txt_qt019.Text.Trim();//鍗曟嵁绫诲瀷
- string inLyOrg = txt_qt024.GetId();//棰嗙敤缁勭粐
+ // string inLyOrg = txt_qt024.GetId();//棰嗙敤缁勭粐
+ string inLyOrg = inOrgId;//棰嗙敤缁勭粐绛変簬搴撳瓨缁勭粐
string inLyCus = txt_qt013.GetId();//棰嗙敤瀹㈡埛
string inLyDepart = txt_qt009.GetId();//棰嗙敤閮ㄩ棬
string inKcfx = txt_qt020.Text.Trim();//搴撳瓨鏂瑰悜
@@ -397,12 +520,12 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨璐т富锛�");
return;
}
- if (string.IsNullOrEmpty(inLyOrg))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨棰嗙敤缁勭粐锛�");
- txt_qt024.Focus();
- return;
- }
+ //if (string.IsNullOrEmpty(inLyOrg))
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨棰嗙敤缁勭粐锛�");
+ // txt_qt024.Focus();
+ // return;
+ //}
if (txt_qtlx.SelectedIndex <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍑哄簱绫诲瀷锛�");
@@ -595,6 +718,10 @@
_ucHzlx = dy.qt025;
_ucHz = dy.qt018;
_ucGys = dy.wwgys;//濮斿渚涘簲鍟�
+ // ucLookHuoZhu1.OrgId = _orgId;
+ ucLookHuoZhu1.HzId = _ucHz;
+ ucLookHuoZhu1.SetHzLx(_ucHzlx);
+ ucLookHuoZhu1.SetHzId(_ucHz);
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
@@ -634,7 +761,16 @@
}
}
-
+ /// <summary>
+ /// 瀹岀粨
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
+ {
+ _toolCk(2);
+ }
/// <summary>
/// 瀹℃牳浜嬩欢
/// </summary>
@@ -733,6 +869,9 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
+ case 2:
+ strMsg = "瀹岀粨";
+ break;
case 20:
strMsg = "鍞悗瀹℃牳";
break;
@@ -791,7 +930,6 @@
int rowHandle = gridView1.LocateByValue("guid", rowGuid);
gridView1.FocusedRowHandle = rowHandle;
}
-
}
else
MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
@@ -903,5 +1041,27 @@
};
frm.ShowDialog();
}
+
+ private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
+ {
+ //guidKey, rptParameter
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_qtck, gridView1, "qtck");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ this.toolBarMenu1.rptParameter = "rpt_QTCK{"
+ + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "}";
+ this.toolBarMenu1.guidKey = rowGuid;
+
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
index ed5b909..acdecb4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
@@ -85,8 +85,8 @@
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_abtNo = new DevExpress.XtraEditors.TextEdit();
this.txt_kcOrg = new DevExpress.XtraEditors.TextEdit();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
- this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkUserName = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
@@ -136,8 +136,10 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.xtraTabPageReport = new DevExpress.XtraTab.XtraTabPage();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.ucRptQtdj1 = new Gs.DevApp.DevFrm.Rpt.UcRptQtdj();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -169,8 +171,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_abtNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
@@ -201,6 +203,7 @@
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ this.xtraTabPageReport.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
@@ -213,6 +216,7 @@
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(4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
@@ -230,7 +234,8 @@
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
- this.xtraTabPage2});
+ this.xtraTabPage2,
+ this.xtraTabPageReport});
//
// xtraTabPage1
//
@@ -378,7 +383,7 @@
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
- this.gv_checkUser.FieldName = "checkUser";
+ this.gv_checkUser.FieldName = "checkUserName";
this.gv_checkUser.MinWidth = 25;
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
@@ -430,7 +435,7 @@
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
- this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.FieldName = "createByName";
this.gv_createBy.MinWidth = 25;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
@@ -618,8 +623,8 @@
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_abtNo);
this.layoutMx1.Controls.Add(this.txt_kcOrg);
- this.layoutMx1.Controls.Add(this.txt_createBy);
- this.layoutMx1.Controls.Add(this.txt_checkUser);
+ this.layoutMx1.Controls.Add(this.txt_createByName);
+ this.layoutMx1.Controls.Add(this.txt_checkUserName);
this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Controls.Add(this.txt_status);
this.layoutMx1.Controls.Add(this.txt_guid);
@@ -751,23 +756,23 @@
this.txt_kcOrg.StyleController = this.layoutMx1;
this.txt_kcOrg.TabIndex = 216;
//
- // txt_createBy
+ // txt_createByName
//
- this.txt_createBy.Location = new System.Drawing.Point(636, 41);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(200, 24);
- this.txt_createBy.StyleController = this.layoutMx1;
- this.txt_createBy.TabIndex = 222;
+ this.txt_createByName.Location = new System.Drawing.Point(636, 41);
+ this.txt_createByName.Name = "txt_createByName";
+ this.txt_createByName.Properties.Appearance.Options.UseFont = true;
+ this.txt_createByName.Size = new System.Drawing.Size(200, 24);
+ this.txt_createByName.StyleController = this.layoutMx1;
+ this.txt_createByName.TabIndex = 222;
//
- // txt_checkUser
+ // txt_checkUserName
//
- this.txt_checkUser.Location = new System.Drawing.Point(912, 41);
- this.txt_checkUser.Name = "txt_checkUser";
- this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(202, 24);
- this.txt_checkUser.StyleController = this.layoutMx1;
- this.txt_checkUser.TabIndex = 258;
+ this.txt_checkUserName.Location = new System.Drawing.Point(912, 41);
+ this.txt_checkUserName.Name = "txt_checkUserName";
+ this.txt_checkUserName.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkUserName.Size = new System.Drawing.Size(202, 24);
+ this.txt_checkUserName.StyleController = this.layoutMx1;
+ this.txt_checkUserName.TabIndex = 258;
//
// txt_createDate
//
@@ -935,7 +940,7 @@
//
// layoutControlItem7
//
- this.layoutControlItem7.Control = this.txt_createBy;
+ this.layoutControlItem7.Control = this.txt_createByName;
this.layoutControlItem7.Location = new System.Drawing.Point(552, 29);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -946,7 +951,7 @@
//
// layoutControlItem8
//
- this.layoutControlItem8.Control = this.txt_checkUser;
+ this.layoutControlItem8.Control = this.txt_checkUserName;
this.layoutControlItem8.Location = new System.Drawing.Point(828, 29);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1201,7 +1206,7 @@
// gridColumn4
//
this.gridColumn4.Caption = "寤虹珛鑰�";
- this.gridColumn4.FieldName = "createBy";
+ this.gridColumn4.FieldName = "createByName";
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
@@ -1329,7 +1334,7 @@
// gridColumn2
//
this.gridColumn2.Caption = "寤虹珛鑰�";
- this.gridColumn2.FieldName = "createBy";
+ this.gridColumn2.FieldName = "createByName";
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
@@ -1358,6 +1363,14 @@
this.gvMx2remark.VisibleIndex = 8;
this.gvMx2remark.Width = 94;
//
+ // xtraTabPageReport
+ //
+ this.xtraTabPageReport.Controls.Add(this.ucRptQtdj1);
+ this.xtraTabPageReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
+ this.xtraTabPageReport.Name = "xtraTabPageReport";
+ this.xtraTabPageReport.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPageReport.Text = "鎶ヨ〃";
+ //
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1368,6 +1381,14 @@
this.picCheckBox.TabIndex = 9;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // ucRptQtdj1
+ //
+ this.ucRptQtdj1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ucRptQtdj1.Location = new System.Drawing.Point(0, 0);
+ this.ucRptQtdj1.Name = "ucRptQtdj1";
+ this.ucRptQtdj1.Size = new System.Drawing.Size(1126, 570);
+ this.ucRptQtdj1.TabIndex = 0;
//
// Frm_MesItemQtDj
//
@@ -1410,8 +1431,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_abtNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
@@ -1442,6 +1463,7 @@
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ this.xtraTabPageReport.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -1480,10 +1502,10 @@
private DevExpress.XtraEditors.TextEdit txt_lykh;
private DevExpress.XtraEditors.TextEdit txt_abtNo;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
- private DevExpress.XtraEditors.TextEdit txt_checkUser;
+ private DevExpress.XtraEditors.TextEdit txt_checkUserName;
private DevExpress.XtraEditors.TextEdit txt_sqRemark;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraEditors.TextEdit txt_createBy;
+ private DevExpress.XtraEditors.TextEdit txt_createByName;
private DevExpress.XtraEditors.TextEdit txt_kcOrg;
private DevExpress.XtraEditors.TextEdit txt_itemOutNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
@@ -1545,5 +1567,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPageReport;
+ private Rpt.UcRptQtdj ucRptQtdj1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs
index 95c201b..b9a90e7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs
@@ -1,4 +1,5 @@
-锘縰sing Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -28,16 +29,20 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "statusChk", "", (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);
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- }, lbGuid);
+ }, lbGuid, toolBarMenu1
+ , () =>
+ {
+ ucRptQtdj1.Initialize();
+ });
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
@@ -78,12 +83,17 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ return;
+ }
+ ucRptQtdj1.ToolBarMenu1_btnQueryClick(sender, e);
}
/// <summary>
/// 鏌ヨ鍥炶皟
@@ -282,7 +292,8 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
- };
+ }
+ ;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1, "itemOutNo");
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 107801e..c3da230 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -31,36 +31,36 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemQtrk));
- DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ 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.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = 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();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -86,17 +86,19 @@
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.ucBtnPrintAll1 = new Gs.DevApp.UserControl.UcBtnPrintAll();
this.btnCopyXls = new DevExpress.XtraEditors.SimpleButton();
this.txt_qt003 = new Gs.DevApp.UserControl.UcDictionaryComBox();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_qt010 = new DevExpress.XtraEditors.TextEdit();
this.ucLookHuoZhu1 = new Gs.DevApp.UserControl.UcLookHuoZhu();
this.txt_qt008 = new Gs.DevApp.UserControl.UcLookCk();
- this.txt_qt016 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_qt016Name = new DevExpress.XtraEditors.TextEdit();
this.txt_qt018 = new Gs.DevApp.UserControl.UcLookSupplier();
this.txt_qt022 = new Gs.DevApp.UserControl.UcLookOrg();
this.txt_qt009 = new Gs.DevApp.UserControl.UcLookDepartment();
@@ -106,10 +108,10 @@
this.txt_qt015 = new DevExpress.XtraEditors.CheckEdit();
this.txt_qt005 = new DevExpress.XtraEditors.TextEdit();
this.txt_qt001 = new DevExpress.XtraEditors.TextEdit();
- this.txt_qt030 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_qt030Name = new DevExpress.XtraEditors.TextEdit();
this.txt_qt029 = new DevExpress.XtraEditors.TextEdit();
this.txt_qt028 = new DevExpress.XtraEditors.CheckEdit();
- this.txt_qt034 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_qt034Name = new DevExpress.XtraEditors.TextEdit();
this.txt_qt033 = new DevExpress.XtraEditors.TextEdit();
this.txt_qt032 = new DevExpress.XtraEditors.CheckEdit();
this.txt_qt035 = new DevExpress.XtraEditors.ButtonEdit();
@@ -141,6 +143,7 @@
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -218,7 +221,6 @@
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -239,17 +241,17 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_qt010.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt016.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt016Name.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qtck.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt002.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt005.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt001.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt030Name.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt034Name.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).BeginInit();
@@ -281,6 +283,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -341,9 +344,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(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = "rpt_Qtrk{}";
- this.toolBarMenu1.Size = new System.Drawing.Size(1334, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1668, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -351,10 +355,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, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1334, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1668, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -363,8 +368,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1332, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1666, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -373,6 +379,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(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -381,17 +388,19 @@
this.split1.Panel1.Controls.Add(this.pageBar1);
this.split1.Panel1.Text = "Panel1";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1332, 570);
+ this.split1.Size = new System.Drawing.Size(1666, 698);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 4;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1332, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1666, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -401,7 +410,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 = 50;
+ this.gridView1.ColumnPanelRowHeight = 61;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_qt015,
this.gv_qt014,
@@ -423,8 +432,9 @@
this.gridColumn26,
this.gridColumn27,
this.gridColumn28});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -435,238 +445,251 @@
this.gv_qt015.AppearanceCell.Options.UseFont = true;
this.gv_qt015.Caption = "瀹℃牳鐘舵�� ";
this.gv_qt015.FieldName = "isSh";
- this.gv_qt015.MaxWidth = 50;
- this.gv_qt015.MinWidth = 50;
+ this.gv_qt015.MaxWidth = 62;
+ this.gv_qt015.MinWidth = 62;
this.gv_qt015.Name = "gv_qt015";
this.gv_qt015.OptionsColumn.AllowEdit = false;
this.gv_qt015.Tag = "query_a.qt015";
this.gv_qt015.Visible = true;
- this.gv_qt015.VisibleIndex = 0;
- this.gv_qt015.Width = 50;
+ this.gv_qt015.VisibleIndex = 1;
+ this.gv_qt015.Width = 62;
//
// gv_qt014
//
this.gv_qt014.AppearanceCell.Options.UseFont = true;
this.gv_qt014.Caption = "瀹岀粨鏍囪瘑 ";
- this.gv_qt014.FieldName = "isWj";
- this.gv_qt014.MaxWidth = 50;
- this.gv_qt014.MinWidth = 50;
+ this.gv_qt014.FieldName = "txtColor";
+ this.gv_qt014.MaxWidth = 62;
+ this.gv_qt014.MinWidth = 62;
this.gv_qt014.Name = "gv_qt014";
this.gv_qt014.OptionsColumn.AllowEdit = false;
this.gv_qt014.Tag = "query_a.qt014";
- this.gv_qt014.Width = 50;
+ this.gv_qt014.Visible = true;
+ this.gv_qt014.VisibleIndex = 0;
+ this.gv_qt014.Width = 62;
//
// gv_qtck
//
this.gv_qtck.AppearanceCell.Options.UseFont = true;
this.gv_qtck.Caption = "鐢宠鍗曞彿 ";
this.gv_qtck.FieldName = "qtck";
- this.gv_qtck.MinWidth = 25;
+ this.gv_qtck.MinWidth = 31;
this.gv_qtck.Name = "gv_qtck";
this.gv_qtck.OptionsColumn.AllowEdit = false;
this.gv_qtck.Tag = "query_a.qtck";
this.gv_qtck.Visible = true;
- this.gv_qtck.VisibleIndex = 3;
- this.gv_qtck.Width = 180;
+ this.gv_qtck.VisibleIndex = 4;
+ this.gv_qtck.Width = 225;
//
// gv_qt003
//
this.gv_qt003.AppearanceCell.Options.UseFont = true;
this.gv_qt003.Caption = "鍗曟嵁绫诲瀷";
this.gv_qt003.FieldName = "qt003";
- this.gv_qt003.MinWidth = 25;
+ this.gv_qt003.MinWidth = 31;
this.gv_qt003.Name = "gv_qt003";
this.gv_qt003.OptionsColumn.AllowEdit = false;
this.gv_qt003.Tag = "query_a.qt003";
this.gv_qt003.Visible = true;
- this.gv_qt003.VisibleIndex = 13;
- this.gv_qt003.Width = 94;
+ this.gv_qt003.VisibleIndex = 14;
+ this.gv_qt003.Width = 117;
//
// gv_qt019
//
this.gv_qt019.AppearanceCell.Options.UseFont = true;
this.gv_qt019.Caption = "搴撳瓨鏂瑰悜";
this.gv_qt019.FieldName = "qt019";
- this.gv_qt019.MinWidth = 25;
+ this.gv_qt019.MinWidth = 31;
this.gv_qt019.Name = "gv_qt019";
this.gv_qt019.OptionsColumn.AllowEdit = false;
this.gv_qt019.Tag = "query_a.qt019";
this.gv_qt019.Visible = true;
- this.gv_qt019.VisibleIndex = 14;
- this.gv_qt019.Width = 94;
+ this.gv_qt019.VisibleIndex = 15;
+ this.gv_qt019.Width = 117;
//
// gv_qt005
//
this.gv_qt005.AppearanceCell.Options.UseFont = true;
this.gv_qt005.Caption = "鐢宠浜�";
- this.gv_qt005.FieldName = "qt005";
- this.gv_qt005.MinWidth = 25;
+ this.gv_qt005.FieldName = "cjPeople";
+ this.gv_qt005.MinWidth = 31;
this.gv_qt005.Name = "gv_qt005";
this.gv_qt005.OptionsColumn.AllowEdit = false;
this.gv_qt005.Tag = "query_a.qt005";
this.gv_qt005.Visible = true;
- this.gv_qt005.VisibleIndex = 5;
- this.gv_qt005.Width = 94;
+ this.gv_qt005.VisibleIndex = 6;
+ this.gv_qt005.Width = 117;
//
// gv_qt001
//
this.gv_qt001.AppearanceCell.Options.UseFont = true;
this.gv_qt001.Caption = "鐢宠鏃ユ湡 ";
this.gv_qt001.FieldName = "qt001";
- this.gv_qt001.MinWidth = 25;
+ this.gv_qt001.MinWidth = 31;
this.gv_qt001.Name = "gv_qt001";
this.gv_qt001.OptionsColumn.AllowEdit = false;
this.gv_qt001.Tag = "query_a.qt001";
this.gv_qt001.Visible = true;
- this.gv_qt001.VisibleIndex = 6;
- this.gv_qt001.Width = 200;
+ this.gv_qt001.VisibleIndex = 7;
+ this.gv_qt001.Width = 250;
//
// gv_qt016
//
this.gv_qt016.AppearanceCell.Options.UseFont = true;
this.gv_qt016.Caption = "瀹℃牳浜� ";
- this.gv_qt016.FieldName = "qt016";
- this.gv_qt016.MinWidth = 25;
+ this.gv_qt016.FieldName = "shPeople";
+ this.gv_qt016.MinWidth = 31;
this.gv_qt016.Name = "gv_qt016";
this.gv_qt016.OptionsColumn.AllowEdit = false;
this.gv_qt016.Tag = "query_a.qt016";
this.gv_qt016.Visible = true;
- this.gv_qt016.VisibleIndex = 10;
- this.gv_qt016.Width = 94;
+ this.gv_qt016.VisibleIndex = 11;
+ this.gv_qt016.Width = 117;
//
// gv_qt002
//
this.gv_qt002.AppearanceCell.Options.UseFont = true;
this.gv_qt002.Caption = "瀹℃牳鏃ユ湡 ";
this.gv_qt002.FieldName = "qt002";
- this.gv_qt002.MinWidth = 25;
+ this.gv_qt002.MinWidth = 31;
this.gv_qt002.Name = "gv_qt002";
this.gv_qt002.OptionsColumn.AllowEdit = false;
this.gv_qt002.Tag = "query_a.qt002";
this.gv_qt002.Visible = true;
- this.gv_qt002.VisibleIndex = 11;
- this.gv_qt002.Width = 180;
+ this.gv_qt002.VisibleIndex = 12;
+ this.gv_qt002.Width = 225;
//
// gv_qt010
//
this.gv_qt010.AppearanceCell.Options.UseFont = true;
this.gv_qt010.Caption = "鐢宠澶囨敞";
this.gv_qt010.FieldName = "qt010";
- this.gv_qt010.MinWidth = 25;
+ this.gv_qt010.MinWidth = 31;
this.gv_qt010.Name = "gv_qt010";
this.gv_qt010.OptionsColumn.AllowEdit = false;
this.gv_qt010.Tag = "query_a.qt010";
this.gv_qt010.Visible = true;
- this.gv_qt010.VisibleIndex = 12;
- this.gv_qt010.Width = 94;
+ this.gv_qt010.VisibleIndex = 13;
+ this.gv_qt010.Width = 117;
//
// gridColumn13
//
this.gridColumn13.Caption = "搴撳瓨缁勭粐";
this.gridColumn13.FieldName = "kcOrg";
- this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.MinWidth = 31;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 15;
- this.gridColumn13.Width = 94;
+ this.gridColumn13.VisibleIndex = 16;
+ this.gridColumn13.Width = 117;
//
// gridColumn14
//
this.gridColumn14.Caption = "璐т富绫诲瀷";
this.gridColumn14.FieldName = "qt023";
- this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.MinWidth = 31;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 16;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.VisibleIndex = 17;
+ this.gridColumn14.Width = 117;
//
// gridColumn21
//
this.gridColumn21.Caption = "璐т富鍚嶇О";
this.gridColumn21.FieldName = "hzName";
- this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.MinWidth = 31;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 17;
- this.gridColumn21.Width = 94;
+ this.gridColumn21.VisibleIndex = 18;
+ this.gridColumn21.Width = 117;
//
// gridColumn22
//
this.gridColumn22.Caption = "浠撳簱鍚嶇О";
this.gridColumn22.FieldName = "ckName";
- this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.MinWidth = 31;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 7;
- this.gridColumn22.Width = 94;
+ this.gridColumn22.VisibleIndex = 8;
+ this.gridColumn22.Width = 117;
//
// gridColumn23
//
this.gridColumn23.Caption = "閮ㄩ棬鍚嶇О";
this.gridColumn23.FieldName = "bmName";
- this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.MinWidth = 31;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 8;
- this.gridColumn23.Width = 94;
+ this.gridColumn23.VisibleIndex = 9;
+ this.gridColumn23.Width = 117;
//
// gridColumn24
//
this.gridColumn24.Caption = "渚涘簲鍟嗗悕绉�";
this.gridColumn24.FieldName = "gysName";
- this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.MinWidth = 31;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 9;
- this.gridColumn24.Width = 94;
+ this.gridColumn24.VisibleIndex = 10;
+ this.gridColumn24.Width = 117;
//
// gridColumn25
//
this.gridColumn25.Caption = "涓婚敭Guid";
this.gridColumn25.FieldName = "guid";
- this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.MinWidth = 31;
this.gridColumn25.Name = "gridColumn25";
- this.gridColumn25.Width = 94;
+ this.gridColumn25.Width = 117;
//
// gridColumn26
//
this.gridColumn26.Caption = "璐㈠姟瀹℃牳";
this.gridColumn26.FieldName = "isCwChk";
- this.gridColumn26.MinWidth = 25;
+ this.gridColumn26.MinWidth = 31;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Tag = "query_a.qt028";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 2;
- this.gridColumn26.Width = 94;
+ this.gridColumn26.VisibleIndex = 3;
+ this.gridColumn26.Width = 117;
//
// gridColumn27
//
this.gridColumn27.Caption = "閲囪喘瀹℃牳";
this.gridColumn27.FieldName = "isCgChk";
- this.gridColumn27.MinWidth = 25;
+ this.gridColumn27.MinWidth = 31;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.Tag = "query_a.qt032";
this.gridColumn27.Visible = true;
- this.gridColumn27.VisibleIndex = 1;
- this.gridColumn27.Width = 94;
+ this.gridColumn27.VisibleIndex = 2;
+ this.gridColumn27.Width = 117;
+ //
+ // gridColumn28
+ //
+ this.gridColumn28.Caption = "鍏ュ簱绫诲瀷";
+ this.gridColumn28.FieldName = "qtlx";
+ this.gridColumn28.MinWidth = 31;
+ this.gridColumn28.Name = "gridColumn28";
+ this.gridColumn28.Visible = true;
+ this.gridColumn28.VisibleIndex = 5;
+ this.gridColumn28.Width = 117;
//
// 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, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1332, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1666, 48);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1332, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1666, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -674,6 +697,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(4, 4, 4, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -686,19 +710,20 @@
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(1332, 570);
- this.splitMx1.SplitterPosition = 207;
+ this.splitMx1.Size = new System.Drawing.Size(1666, 698);
+ this.splitMx1.SplitterPosition = 253;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.ucBtnPrintAll1);
this.layoutMx1.Controls.Add(this.btnCopyXls);
this.layoutMx1.Controls.Add(this.txt_qt003);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_qt010);
this.layoutMx1.Controls.Add(this.ucLookHuoZhu1);
this.layoutMx1.Controls.Add(this.txt_qt008);
- this.layoutMx1.Controls.Add(this.txt_qt016);
+ this.layoutMx1.Controls.Add(this.txt_qt016Name);
this.layoutMx1.Controls.Add(this.txt_qt018);
this.layoutMx1.Controls.Add(this.txt_qt022);
this.layoutMx1.Controls.Add(this.txt_qt009);
@@ -708,10 +733,10 @@
this.layoutMx1.Controls.Add(this.txt_qt015);
this.layoutMx1.Controls.Add(this.txt_qt005);
this.layoutMx1.Controls.Add(this.txt_qt001);
- this.layoutMx1.Controls.Add(this.txt_qt030);
+ this.layoutMx1.Controls.Add(this.txt_qt030Name);
this.layoutMx1.Controls.Add(this.txt_qt029);
this.layoutMx1.Controls.Add(this.txt_qt028);
- this.layoutMx1.Controls.Add(this.txt_qt034);
+ this.layoutMx1.Controls.Add(this.txt_qt034Name);
this.layoutMx1.Controls.Add(this.txt_qt033);
this.layoutMx1.Controls.Add(this.txt_qt032);
this.layoutMx1.Controls.Add(this.txt_qt035);
@@ -724,47 +749,62 @@
this.layoutControlItem14,
this.layoutControlItem15});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(600, 497, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1332, 207);
+ this.layoutMx1.Size = new System.Drawing.Size(1666, 253);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // ucBtnPrintAll1
+ //
+ this.ucBtnPrintAll1.Location = new System.Drawing.Point(834, 204);
+ this.ucBtnPrintAll1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.ucBtnPrintAll1.mxList = null;
+ this.ucBtnPrintAll1.Name = "ucBtnPrintAll1";
+ this.ucBtnPrintAll1.rptType = null;
+ this.ucBtnPrintAll1.Size = new System.Drawing.Size(406, 32);
+ this.ucBtnPrintAll1.TabIndex = 446;
//
// btnCopyXls
//
this.btnCopyXls.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCopyXls.ImageOptions.Image")));
- this.btnCopyXls.Location = new System.Drawing.Point(12, 167);
+ this.btnCopyXls.Location = new System.Drawing.Point(14, 204);
+ this.btnCopyXls.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnCopyXls.Name = "btnCopyXls";
- this.btnCopyXls.Size = new System.Drawing.Size(131, 27);
+ this.btnCopyXls.Size = new System.Drawing.Size(165, 34);
this.btnCopyXls.StyleController = this.layoutMx1;
this.btnCopyXls.TabIndex = 444;
this.btnCopyXls.Text = "蹇嵎褰曞叆";
//
// txt_qt003
//
- this.txt_qt003.Location = new System.Drawing.Point(770, 43);
+ this.txt_qt003.Location = new System.Drawing.Point(957, 52);
+ this.txt_qt003.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_qt003.Name = "txt_qt003";
- this.txt_qt003.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt003.Size = new System.Drawing.Size(283, 28);
this.txt_qt003.TabIndex = 333;
this.txt_qt003.TextTxt = "鍏跺畠鍏ュ簱(QTRKD01_SYS)";
this.txt_qt003.WhereTxt = "a.s_type=\'鍏跺畠鍏ュ簱鍗曟嵁绫诲瀷\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(855, 108);
+ this.lbGuid.Location = new System.Drawing.Point(1069, 132);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(279, 28);
+ this.lbGuid.Size = new System.Drawing.Size(349, 34);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_qt010
//
- this.txt_qt010.Location = new System.Drawing.Point(114, 136);
+ this.txt_qt010.Location = new System.Drawing.Point(137, 166);
+ this.txt_qt010.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt010.Name = "txt_qt010";
this.txt_qt010.Properties.Appearance.Options.UseFont = true;
- this.txt_qt010.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt010.Size = new System.Drawing.Size(283, 28);
this.txt_qt010.StyleController = this.layoutMx1;
this.txt_qt010.TabIndex = 240;
//
@@ -772,73 +812,78 @@
//
this.ucLookHuoZhu1.HzId = null;
this.ucLookHuoZhu1.IsReadly = false;
- this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 74);
+ this.ucLookHuoZhu1.Location = new System.Drawing.Point(14, 90);
this.ucLookHuoZhu1.Margin = new System.Windows.Forms.Padding(0);
this.ucLookHuoZhu1.Name = "ucLookHuoZhu1";
this.ucLookHuoZhu1.OrgId = null;
- this.ucLookHuoZhu1.Size = new System.Drawing.Size(324, 58);
+ this.ucLookHuoZhu1.Size = new System.Drawing.Size(406, 72);
this.ucLookHuoZhu1.TabIndex = 329;
//
// txt_qt008
//
this.txt_qt008.IsReadly = false;
- this.txt_qt008.Location = new System.Drawing.Point(442, 105);
+ this.txt_qt008.Location = new System.Drawing.Point(547, 128);
this.txt_qt008.Margin = new System.Windows.Forms.Padding(0);
this.txt_qt008.Name = "txt_qt008";
- this.txt_qt008.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt008.Size = new System.Drawing.Size(283, 28);
this.txt_qt008.TabIndex = 301;
//
- // txt_qt016
+ // txt_qt016Name
//
- this.txt_qt016.Location = new System.Drawing.Point(770, 74);
- this.txt_qt016.Name = "txt_qt016";
- this.txt_qt016.Properties.Appearance.Options.UseFont = true;
- this.txt_qt016.Size = new System.Drawing.Size(222, 24);
- this.txt_qt016.StyleController = this.layoutMx1;
- this.txt_qt016.TabIndex = 267;
- this.txt_qt016.Tag = "readonly";
+ this.txt_qt016Name.Location = new System.Drawing.Point(957, 90);
+ this.txt_qt016Name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_qt016Name.Name = "txt_qt016Name";
+ this.txt_qt016Name.Properties.Appearance.Options.UseFont = true;
+ this.txt_qt016Name.Size = new System.Drawing.Size(283, 28);
+ this.txt_qt016Name.StyleController = this.layoutMx1;
+ this.txt_qt016Name.TabIndex = 267;
+ this.txt_qt016Name.Tag = "readonly";
//
// txt_qt018
//
this.txt_qt018.IsReadly = false;
- this.txt_qt018.Location = new System.Drawing.Point(442, 74);
+ this.txt_qt018.Location = new System.Drawing.Point(547, 90);
this.txt_qt018.Margin = new System.Windows.Forms.Padding(0);
this.txt_qt018.Name = "txt_qt018";
- this.txt_qt018.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt018.Size = new System.Drawing.Size(283, 28);
this.txt_qt018.TabIndex = 302;
//
// txt_qt022
//
this.txt_qt022.IsReadly = false;
- this.txt_qt022.Location = new System.Drawing.Point(114, 43);
+ this.txt_qt022.Location = new System.Drawing.Point(137, 52);
+ this.txt_qt022.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_qt022.Name = "txt_qt022";
- this.txt_qt022.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt022.Size = new System.Drawing.Size(283, 28);
this.txt_qt022.TabIndex = 326;
//
// txt_qt009
//
this.txt_qt009.IsReadly = false;
- this.txt_qt009.Location = new System.Drawing.Point(442, 43);
+ this.txt_qt009.Location = new System.Drawing.Point(547, 52);
+ this.txt_qt009.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.txt_qt009.Name = "txt_qt009";
- this.txt_qt009.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt009.Size = new System.Drawing.Size(283, 28);
this.txt_qt009.TabIndex = 304;
//
// txt_qtck
//
- this.txt_qtck.Location = new System.Drawing.Point(114, 12);
+ this.txt_qtck.Location = new System.Drawing.Point(137, 14);
+ this.txt_qtck.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qtck.Name = "txt_qtck";
this.txt_qtck.Properties.Appearance.Options.UseFont = true;
- this.txt_qtck.Size = new System.Drawing.Size(222, 24);
+ this.txt_qtck.Size = new System.Drawing.Size(283, 28);
this.txt_qtck.StyleController = this.layoutMx1;
this.txt_qtck.TabIndex = 213;
this.txt_qtck.Tag = "readonly";
//
// txt_qt002
//
- this.txt_qt002.Location = new System.Drawing.Point(770, 105);
+ this.txt_qt002.Location = new System.Drawing.Point(957, 128);
+ this.txt_qt002.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt002.Name = "txt_qt002";
this.txt_qt002.Properties.Appearance.Options.UseFont = true;
- this.txt_qt002.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt002.Size = new System.Drawing.Size(283, 28);
this.txt_qt002.StyleController = this.layoutMx1;
this.txt_qt002.TabIndex = 217;
this.txt_qt002.Tag = "readonly";
@@ -846,7 +891,8 @@
// txt_qt019
//
this.txt_qt019.EditValue = "鏅��(GENERAL)";
- this.txt_qt019.Location = new System.Drawing.Point(770, 12);
+ this.txt_qt019.Location = new System.Drawing.Point(957, 14);
+ this.txt_qt019.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt019.Name = "txt_qt019";
this.txt_qt019.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -854,112 +900,123 @@
"鏅��(GENERAL)",
"閫�璐�(RETURN)"});
this.txt_qt019.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qt019.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt019.Size = new System.Drawing.Size(283, 28);
this.txt_qt019.StyleController = this.layoutMx1;
this.txt_qt019.TabIndex = 299;
//
// txt_qt015
//
- this.txt_qt015.Location = new System.Drawing.Point(668, 136);
+ this.txt_qt015.Location = new System.Drawing.Point(834, 166);
+ this.txt_qt015.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt015.Name = "txt_qt015";
this.txt_qt015.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_qt015.Size = new System.Drawing.Size(324, 24);
+ this.txt_qt015.Size = new System.Drawing.Size(406, 27);
this.txt_qt015.StyleController = this.layoutMx1;
this.txt_qt015.TabIndex = 330;
this.txt_qt015.Tag = "readonly";
//
// txt_qt005
//
- this.txt_qt005.Location = new System.Drawing.Point(759, 43);
+ this.txt_qt005.Location = new System.Drawing.Point(949, 53);
+ this.txt_qt005.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt005.Name = "txt_qt005";
this.txt_qt005.Properties.Appearance.Options.UseFont = true;
- this.txt_qt005.Size = new System.Drawing.Size(217, 24);
+ this.txt_qt005.Size = new System.Drawing.Size(271, 28);
this.txt_qt005.StyleController = this.layoutMx1;
this.txt_qt005.TabIndex = 331;
this.txt_qt005.Tag = "readonly";
//
// txt_qt001
//
- this.txt_qt001.Location = new System.Drawing.Point(759, 74);
+ this.txt_qt001.Location = new System.Drawing.Point(949, 90);
+ this.txt_qt001.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt001.Name = "txt_qt001";
this.txt_qt001.Properties.Appearance.Options.UseFont = true;
- this.txt_qt001.Size = new System.Drawing.Size(217, 24);
+ this.txt_qt001.Size = new System.Drawing.Size(271, 28);
this.txt_qt001.StyleController = this.layoutMx1;
this.txt_qt001.TabIndex = 332;
this.txt_qt001.Tag = "readonly";
//
- // txt_qt030
+ // txt_qt030Name
//
- this.txt_qt030.Location = new System.Drawing.Point(1098, 105);
- this.txt_qt030.Name = "txt_qt030";
- this.txt_qt030.Size = new System.Drawing.Size(222, 24);
- this.txt_qt030.StyleController = this.layoutMx1;
- this.txt_qt030.TabIndex = 334;
- this.txt_qt030.Tag = "readonly";
+ this.txt_qt030Name.Location = new System.Drawing.Point(1367, 128);
+ this.txt_qt030Name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_qt030Name.Name = "txt_qt030Name";
+ this.txt_qt030Name.Size = new System.Drawing.Size(285, 28);
+ this.txt_qt030Name.StyleController = this.layoutMx1;
+ this.txt_qt030Name.TabIndex = 334;
+ this.txt_qt030Name.Tag = "readonly";
//
// txt_qt029
//
- this.txt_qt029.Location = new System.Drawing.Point(1098, 136);
+ this.txt_qt029.Location = new System.Drawing.Point(1367, 166);
+ this.txt_qt029.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt029.Name = "txt_qt029";
- this.txt_qt029.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt029.Size = new System.Drawing.Size(285, 28);
this.txt_qt029.StyleController = this.layoutMx1;
this.txt_qt029.TabIndex = 335;
this.txt_qt029.Tag = "readonly";
//
// txt_qt028
//
- this.txt_qt028.Location = new System.Drawing.Point(996, 167);
+ this.txt_qt028.Location = new System.Drawing.Point(1244, 204);
+ this.txt_qt028.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt028.Name = "txt_qt028";
this.txt_qt028.Properties.Caption = "璐㈠姟瀹℃牳鏍囪瘑";
- this.txt_qt028.Size = new System.Drawing.Size(324, 24);
+ this.txt_qt028.Size = new System.Drawing.Size(408, 27);
this.txt_qt028.StyleController = this.layoutMx1;
this.txt_qt028.TabIndex = 336;
this.txt_qt028.Tag = "readonly";
//
- // txt_qt034
+ // txt_qt034Name
//
- this.txt_qt034.Location = new System.Drawing.Point(1098, 12);
- this.txt_qt034.Name = "txt_qt034";
- this.txt_qt034.Size = new System.Drawing.Size(222, 24);
- this.txt_qt034.StyleController = this.layoutMx1;
- this.txt_qt034.TabIndex = 337;
- this.txt_qt034.Tag = "readonly";
+ this.txt_qt034Name.Location = new System.Drawing.Point(1367, 14);
+ this.txt_qt034Name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_qt034Name.Name = "txt_qt034Name";
+ this.txt_qt034Name.Size = new System.Drawing.Size(285, 28);
+ this.txt_qt034Name.StyleController = this.layoutMx1;
+ this.txt_qt034Name.TabIndex = 337;
+ this.txt_qt034Name.Tag = "readonly";
//
// txt_qt033
//
- this.txt_qt033.Location = new System.Drawing.Point(1098, 43);
+ this.txt_qt033.Location = new System.Drawing.Point(1367, 52);
+ this.txt_qt033.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt033.Name = "txt_qt033";
- this.txt_qt033.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt033.Size = new System.Drawing.Size(285, 28);
this.txt_qt033.StyleController = this.layoutMx1;
this.txt_qt033.TabIndex = 338;
this.txt_qt033.Tag = "readonly";
//
// txt_qt032
//
- this.txt_qt032.Location = new System.Drawing.Point(996, 74);
+ this.txt_qt032.Location = new System.Drawing.Point(1244, 90);
+ this.txt_qt032.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt032.Name = "txt_qt032";
this.txt_qt032.Properties.Caption = "閲囪喘瀹℃牳鏍囪瘑";
- this.txt_qt032.Size = new System.Drawing.Size(324, 24);
+ this.txt_qt032.Size = new System.Drawing.Size(408, 27);
this.txt_qt032.StyleController = this.layoutMx1;
this.txt_qt032.TabIndex = 339;
this.txt_qt032.Tag = "readonly";
//
// txt_qt035
//
- this.txt_qt035.Location = new System.Drawing.Point(442, 136);
+ this.txt_qt035.Location = new System.Drawing.Point(547, 166);
+ this.txt_qt035.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt035.Name = "txt_qt035";
this.txt_qt035.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton()});
- this.txt_qt035.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt035.Size = new System.Drawing.Size(283, 28);
this.txt_qt035.StyleController = this.layoutMx1;
this.txt_qt035.TabIndex = 340;
//
// txt_isIqc
//
- this.txt_isIqc.Location = new System.Drawing.Point(340, 155);
+ this.txt_isIqc.Location = new System.Drawing.Point(425, 189);
+ this.txt_isIqc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_isIqc.Name = "txt_isIqc";
this.txt_isIqc.Properties.Caption = "鏄惁闇�瑕両QC,鍒跺崟瀹℃牳鍚庣敓鏁�";
- this.txt_isIqc.Size = new System.Drawing.Size(324, 24);
+ this.txt_isIqc.Size = new System.Drawing.Size(405, 27);
this.txt_isIqc.StyleController = this.layoutMx1;
this.txt_isIqc.TabIndex = 341;
this.txt_isIqc.Tag = "readonly";
@@ -967,7 +1024,8 @@
// txt_qtlx
//
this.txt_qtlx.EditValue = "璇烽�夋嫨";
- this.txt_qtlx.Location = new System.Drawing.Point(442, 12);
+ this.txt_qtlx.Location = new System.Drawing.Point(547, 14);
+ this.txt_qtlx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qtlx.Name = "txt_qtlx";
this.txt_qtlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -977,9 +1035,10 @@
"2:鎷嗗嵏鍏ュ簱",
"3:渚涘簲鍟嗚禒閫�",
"4:鏃犳簮鍗曞澶栭��鏉愭枡",
- "5:鐩樼泩"});
+ "5:鐩樼泩",
+ "6:宸ュ崟瀹屾垚鍚庨��鎹㈡枡"});
this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qtlx.Size = new System.Drawing.Size(222, 24);
+ this.txt_qtlx.Size = new System.Drawing.Size(283, 28);
this.txt_qtlx.StyleController = this.layoutMx1;
this.txt_qtlx.TabIndex = 445;
//
@@ -1017,7 +1076,7 @@
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem14.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem14.Text = "鐢宠浜哄憳";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(112, 22);
//
// layoutControlItem15
//
@@ -1028,7 +1087,7 @@
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem15.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem15.Text = "鐢宠鏃堕棿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(112, 22);
//
// Root
//
@@ -1055,42 +1114,43 @@
this.layoutControlItem11,
this.layoutControlItem2,
this.layoutControlItem38,
- this.layoutControlItem3});
+ this.layoutControlItem3,
+ this.layoutControlItem39});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition11.Width = 100D;
- columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition12.Width = 100D;
- columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition13.Width = 100D;
- columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition14.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition11,
- columnDefinition12,
- columnDefinition13,
- columnDefinition14});
- rowDefinition11.Height = 100D;
- rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition12.Height = 100D;
- rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition15.Height = 100D;
- rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition16.Height = 100D;
- rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ 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;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition11,
- rowDefinition12,
- rowDefinition13,
- rowDefinition14,
- rowDefinition15,
- rowDefinition16});
- this.Root.Size = new System.Drawing.Size(1332, 207);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
+ this.Root.Size = new System.Drawing.Size(1666, 253);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1098,150 +1158,150 @@
this.layoutControlItem1.Control = this.txt_qtck;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(410, 38);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_qt022;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 38);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(410, 38);
this.layoutControlItem4.Text = "搴撳瓨缁勭粐";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_qt009;
- this.layoutControlItem5.Location = new System.Drawing.Point(328, 31);
+ this.layoutControlItem5.Location = new System.Drawing.Point(410, 38);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(410, 38);
this.layoutControlItem5.Text = "閫夋嫨閮ㄩ棬";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_qt018;
this.layoutControlItem7.CustomizationFormText = "閫変緵搴斿晢";
- this.layoutControlItem7.Location = new System.Drawing.Point(328, 62);
+ this.layoutControlItem7.Location = new System.Drawing.Point(410, 76);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(410, 38);
this.layoutControlItem7.Text = "閫変緵搴斿晢";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_qt008;
- this.layoutControlItem8.Location = new System.Drawing.Point(328, 93);
+ this.layoutControlItem8.Location = new System.Drawing.Point(410, 114);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(410, 38);
this.layoutControlItem8.Text = "鏀舵枡浠撳簱";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.ucLookHuoZhu1;
this.layoutControlItem6.CustomizationFormText = "閫夋嫨璐т富";
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 76);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(328, 62);
+ this.layoutControlItem6.Size = new System.Drawing.Size(410, 76);
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem6.TextVisible = false;
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_qt010;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 152);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(410, 38);
this.layoutControlItem13.Text = "鐢宠澶囨敞";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem16
//
- this.layoutControlItem16.Control = this.txt_qt030;
- this.layoutControlItem16.Location = new System.Drawing.Point(984, 93);
+ this.layoutControlItem16.Control = this.txt_qt030Name;
+ this.layoutControlItem16.Location = new System.Drawing.Point(1230, 114);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem16.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem16.Text = "璐㈠姟瀹℃牳浜哄憳";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_qt029;
- this.layoutControlItem17.Location = new System.Drawing.Point(984, 124);
+ this.layoutControlItem17.Location = new System.Drawing.Point(1230, 152);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem17.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem17.Text = "璐㈠姟瀹℃牳鏃堕棿";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_qt028;
- this.layoutControlItem18.Location = new System.Drawing.Point(984, 155);
+ this.layoutControlItem18.Location = new System.Drawing.Point(1230, 190);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem18.Size = new System.Drawing.Size(328, 32);
+ this.layoutControlItem18.Size = new System.Drawing.Size(412, 39);
this.layoutControlItem18.Text = "璐㈠姟瀹℃牳鏍囪瘑";
this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem18.TextVisible = false;
//
// layoutControlItem19
//
- this.layoutControlItem19.Control = this.txt_qt034;
- this.layoutControlItem19.Location = new System.Drawing.Point(984, 0);
+ this.layoutControlItem19.Control = this.txt_qt034Name;
+ this.layoutControlItem19.Location = new System.Drawing.Point(1230, 0);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem19.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem19.Text = "閲囪喘瀹℃牳浜哄憳";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_qt033;
- this.layoutControlItem20.Location = new System.Drawing.Point(984, 31);
+ this.layoutControlItem20.Location = new System.Drawing.Point(1230, 38);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem20.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem20.Text = "閲囪喘瀹℃牳鏃堕棿";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_qt002;
- this.layoutControlItem10.Location = new System.Drawing.Point(656, 93);
+ this.layoutControlItem10.Location = new System.Drawing.Point(820, 114);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(410, 38);
this.layoutControlItem10.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_qt032;
- this.layoutControlItem21.Location = new System.Drawing.Point(984, 62);
+ this.layoutControlItem21.Location = new System.Drawing.Point(1230, 76);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem21.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem21.Size = new System.Drawing.Size(412, 38);
this.layoutControlItem21.Text = "閲囪喘瀹℃牳鏍囪瘑";
this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem21.TextVisible = false;
@@ -1249,23 +1309,23 @@
// layoutControlItem35
//
this.layoutControlItem35.Control = this.txt_qt035;
- this.layoutControlItem35.Location = new System.Drawing.Point(328, 124);
+ this.layoutControlItem35.Location = new System.Drawing.Point(410, 152);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem35.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem35.Size = new System.Drawing.Size(410, 38);
this.layoutControlItem35.Text = "鏉ユ簮鍗曞彿";
- this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem35.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem37
//
this.layoutControlItem37.Control = this.btnCopyXls;
- this.layoutControlItem37.Location = new System.Drawing.Point(0, 155);
- this.layoutControlItem37.MaxSize = new System.Drawing.Size(135, 31);
- this.layoutControlItem37.MinSize = new System.Drawing.Size(129, 31);
+ this.layoutControlItem37.Location = new System.Drawing.Point(0, 190);
+ this.layoutControlItem37.MaxSize = new System.Drawing.Size(169, 38);
+ this.layoutControlItem37.MinSize = new System.Drawing.Size(161, 38);
this.layoutControlItem37.Name = "layoutControlItem37";
this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem37.Size = new System.Drawing.Size(328, 32);
+ this.layoutControlItem37.Size = new System.Drawing.Size(410, 39);
this.layoutControlItem37.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem37.Text = "浠嶺LS澶嶅埗鏄庣粏";
this.layoutControlItem37.TextSize = new System.Drawing.Size(0, 0);
@@ -1273,23 +1333,23 @@
//
// layoutControlItem9
//
- this.layoutControlItem9.Control = this.txt_qt016;
- this.layoutControlItem9.Location = new System.Drawing.Point(656, 62);
+ this.layoutControlItem9.Control = this.txt_qt016Name;
+ this.layoutControlItem9.Location = new System.Drawing.Point(820, 76);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(410, 38);
this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_qt015;
- this.layoutControlItem11.Location = new System.Drawing.Point(656, 124);
+ this.layoutControlItem11.Location = new System.Drawing.Point(820, 152);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem11.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(410, 38);
this.layoutControlItem11.Text = "瀹℃牳鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -1297,41 +1357,53 @@
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_qt003;
- this.layoutControlItem2.Location = new System.Drawing.Point(656, 31);
+ this.layoutControlItem2.Location = new System.Drawing.Point(820, 38);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(410, 38);
this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.txt_qtlx;
- this.layoutControlItem38.Location = new System.Drawing.Point(328, 0);
+ this.layoutControlItem38.Location = new System.Drawing.Point(410, 0);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem38.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem38.Size = new System.Drawing.Size(410, 38);
this.layoutControlItem38.Text = "鍏ュ簱绫诲瀷";
- this.layoutControlItem38.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem38.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_qt019;
- this.layoutControlItem3.Location = new System.Drawing.Point(656, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(820, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(328, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(410, 38);
this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem39
+ //
+ this.layoutControlItem39.Control = this.ucBtnPrintAll1;
+ this.layoutControlItem39.Location = new System.Drawing.Point(820, 190);
+ this.layoutControlItem39.Name = "layoutControlItem39";
+ this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem39.Size = new System.Drawing.Size(410, 39);
+ this.layoutControlItem39.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem39.TextVisible = false;
//
// tabMx
//
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(4, 4, 4, 4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1332, 351);
+ this.tabMx.Size = new System.Drawing.Size(1666, 430);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1340,8 +1412,9 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.split99);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1330, 319);
+ this.tabMxPage1.Size = new System.Drawing.Size(1664, 392);
this.tabMxPage1.Text = "鐗╂枡鏄庣粏";
//
// split99
@@ -1349,6 +1422,7 @@
this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
this.split99.Horizontal = false;
this.split99.Location = new System.Drawing.Point(0, 0);
+ this.split99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split99.Name = "split99";
//
// split99.Panel1
@@ -1361,8 +1435,8 @@
this.split99.Panel2.Controls.Add(this.gcMx1);
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split99.Size = new System.Drawing.Size(1330, 319);
- this.split99.SplitterPosition = 131;
+ this.split99.Size = new System.Drawing.Size(1664, 392);
+ this.split99.SplitterPosition = 160;
this.split99.TabIndex = 2;
//
// lay99
@@ -1382,18 +1456,20 @@
this.lay99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem32});
this.lay99.Location = new System.Drawing.Point(0, 0);
+ this.lay99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.lay99.Name = "lay99";
this.lay99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(710, 473, 812, 500);
this.lay99.Root = this.layoutControlGroup1;
- this.lay99.Size = new System.Drawing.Size(1330, 131);
+ this.lay99.Size = new System.Drawing.Size(1664, 160);
this.lay99.TabIndex = 1;
this.lay99.Text = "layoutControl1";
//
// lbMxGuid
//
- this.lbMxGuid.Location = new System.Drawing.Point(1032, 44);
+ this.lbMxGuid.Location = new System.Drawing.Point(1290, 54);
+ this.lbMxGuid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.lbMxGuid.Name = "lbMxGuid";
- this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
+ this.lbMxGuid.Size = new System.Drawing.Size(72, 22);
this.lbMxGuid.StyleController = this.lay99;
this.lbMxGuid.TabIndex = 481;
this.lbMxGuid.Text = "lbMxGuid";
@@ -1402,16 +1478,16 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 48);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1244, 59);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(406, 41);
this.ucBtnPrint1.TabIndex = 480;
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(1032, 12);
+ this.radOut.Location = new System.Drawing.Point(1244, 14);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1420,7 +1496,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(336, 32);
+ this.radOut.Size = new System.Drawing.Size(406, 41);
this.radOut.StyleController = this.lay99;
this.radOut.TabIndex = 479;
//
@@ -1428,29 +1504,32 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 84);
+ this.layoutControl1.Location = new System.Drawing.Point(834, 104);
+ this.layoutControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(336, 32);
+ this.layoutControl1.Size = new System.Drawing.Size(406, 42);
this.layoutControl1.TabIndex = 478;
this.layoutControl1.Text = "layoutControl1";
//
// txt_iCount_1
//
- this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
+ this.txt_iCount_1.Location = new System.Drawing.Point(125, 2);
+ this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(76, 28);
this.txt_iCount_1.StyleController = this.layoutControl1;
this.txt_iCount_1.TabIndex = 228;
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(328, 2);
+ this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(76, 28);
this.txt_yuliang_1.StyleController = this.layoutControl1;
this.txt_yuliang_1.TabIndex = 229;
//
@@ -1463,19 +1542,19 @@
this.layoutControlItem34});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "layoutControlGroup2";
- columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition15.Width = 100D;
- columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition16.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition15,
- columnDefinition16});
- rowDefinition17.Height = 100D;
- rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6});
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition17});
+ rowDefinition7});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 32);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(406, 42);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem33
@@ -1483,88 +1562,95 @@
this.layoutControlItem33.Control = this.txt_iCount_1;
this.layoutControlItem33.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.Size = new System.Drawing.Size(168, 32);
+ this.layoutControlItem33.Size = new System.Drawing.Size(203, 42);
this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_yuliang_1;
- this.layoutControlItem34.Location = new System.Drawing.Point(168, 0);
+ this.layoutControlItem34.Location = new System.Drawing.Point(203, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem34.Size = new System.Drawing.Size(168, 32);
+ this.layoutControlItem34.Size = new System.Drawing.Size(203, 42);
this.layoutControlItem34.Text = "鎵撳嵃浣欐暟";
- this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(108, 22);
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(794, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(957, 14);
+ this.txt_kQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(283, 28);
this.txt_kQty.StyleController = this.lay99;
this.txt_kQty.TabIndex = 224;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 48);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(957, 59);
+ this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(283, 28);
this.txt_psnQty_1.StyleController = this.lay99;
this.txt_psnQty_1.TabIndex = 226;
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(454, 12);
+ this.txtQuantity.Location = new System.Drawing.Point(547, 14);
+ this.txtQuantity.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(234, 24);
+ this.txtQuantity.Size = new System.Drawing.Size(283, 28);
this.txtQuantity.StyleController = this.lay99;
this.txtQuantity.TabIndex = 220;
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 48);
+ this.txt_yQty.Location = new System.Drawing.Point(547, 59);
+ this.txt_yQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(283, 28);
this.txt_yQty.StyleController = this.lay99;
this.txt_yQty.TabIndex = 222;
//
// txtWlid
//
- this.txtWlid.Location = new System.Drawing.Point(114, 12);
+ this.txtWlid.Location = new System.Drawing.Point(137, 14);
+ this.txtWlid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(234, 24);
+ this.txtWlid.Size = new System.Drawing.Size(283, 28);
this.txtWlid.StyleController = this.lay99;
this.txtWlid.TabIndex = 214;
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 48);
+ this.txtWlmc.Location = new System.Drawing.Point(137, 59);
+ this.txtWlmc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(234, 24);
+ this.txtWlmc.Size = new System.Drawing.Size(283, 28);
this.txtWlmc.StyleController = this.lay99;
this.txtWlmc.TabIndex = 216;
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 84);
+ this.txtWlgg.Location = new System.Drawing.Point(137, 104);
+ this.txtWlgg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(574, 24);
+ this.txtWlgg.Size = new System.Drawing.Size(693, 28);
this.txtWlgg.StyleController = this.lay99;
this.txtWlgg.TabIndex = 218;
//
@@ -1597,39 +1683,39 @@
this.layoutControlItem31});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition17.Width = 100D;
- columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition18.Width = 100D;
- columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition19.Width = 100D;
- columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition20.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition17,
- columnDefinition18,
- columnDefinition19,
- columnDefinition20});
- rowDefinition18.Height = 100D;
- rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition19.Height = 100D;
- rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition20.Height = 100D;
- rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7,
+ columnDefinition8,
+ columnDefinition9,
+ columnDefinition10});
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition18,
- rowDefinition19,
- rowDefinition20});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 128);
+ rowDefinition8,
+ rowDefinition9,
+ rowDefinition10});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1664, 160);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.radOut;
- this.layoutControlItem23.Location = new System.Drawing.Point(1020, 0);
+ this.layoutControlItem23.Location = new System.Drawing.Point(1230, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem23.Size = new System.Drawing.Size(410, 45);
this.layoutControlItem23.Text = "鎵撳嵃鏂瑰紡";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -1637,11 +1723,11 @@
// layoutControlItem22
//
this.layoutControlItem22.Control = this.layoutControl1;
- this.layoutControlItem22.Location = new System.Drawing.Point(680, 72);
+ this.layoutControlItem22.Location = new System.Drawing.Point(820, 90);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem22.Size = new System.Drawing.Size(410, 46);
this.layoutControlItem22.Text = "鎵撳嵃寮犳暟";
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@@ -1651,50 +1737,50 @@
this.layoutControlItem27.Control = this.txt_kQty;
this.layoutControlItem27.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem27.CustomizationFormText = "鍙墦鍗版�绘暟";
- this.layoutControlItem27.Location = new System.Drawing.Point(680, 0);
+ this.layoutControlItem27.Location = new System.Drawing.Point(820, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem27.Size = new System.Drawing.Size(410, 45);
this.layoutControlItem27.Text = "鍙墦鍗版�绘暟";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_psnQty_1;
this.layoutControlItem28.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem28.CustomizationFormText = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem28.Location = new System.Drawing.Point(680, 36);
+ this.layoutControlItem28.Location = new System.Drawing.Point(820, 45);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem28.Size = new System.Drawing.Size(410, 45);
this.layoutControlItem28.Text = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txtQuantity;
this.layoutControlItem25.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem25.CustomizationFormText = "鏈鐢宠鎬婚噺";
- this.layoutControlItem25.Location = new System.Drawing.Point(340, 0);
+ this.layoutControlItem25.Location = new System.Drawing.Point(410, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem25.Size = new System.Drawing.Size(410, 45);
this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_yQty;
this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem26.CustomizationFormText = "宸叉墦鍗版�婚噺";
- this.layoutControlItem26.Location = new System.Drawing.Point(340, 36);
+ this.layoutControlItem26.Location = new System.Drawing.Point(410, 45);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem26.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem26.Size = new System.Drawing.Size(410, 45);
this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺";
- this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem24
//
@@ -1703,43 +1789,43 @@
this.layoutControlItem24.CustomizationFormText = "鐗╂枡缂栫爜";
this.layoutControlItem24.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem24.Size = new System.Drawing.Size(410, 45);
this.layoutControlItem24.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem29
//
this.layoutControlItem29.Control = this.txtWlmc;
this.layoutControlItem29.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem29.CustomizationFormText = "鐗╂枡鍚嶇О";
- this.layoutControlItem29.Location = new System.Drawing.Point(0, 36);
+ this.layoutControlItem29.Location = new System.Drawing.Point(0, 45);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem29.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem29.Size = new System.Drawing.Size(410, 45);
this.layoutControlItem29.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem30
//
this.layoutControlItem30.Control = this.txtWlgg;
this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem30.CustomizationFormText = "鐗╂枡瑙勬牸";
- this.layoutControlItem30.Location = new System.Drawing.Point(0, 72);
+ this.layoutControlItem30.Location = new System.Drawing.Point(0, 90);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem30.Size = new System.Drawing.Size(680, 36);
+ this.layoutControlItem30.Size = new System.Drawing.Size(820, 46);
this.layoutControlItem30.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem31
//
this.layoutControlItem31.Control = this.ucBtnPrint1;
- this.layoutControlItem31.Location = new System.Drawing.Point(1020, 36);
+ this.layoutControlItem31.Location = new System.Drawing.Point(1230, 45);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem31.Size = new System.Drawing.Size(340, 36);
+ this.layoutControlItem31.Size = new System.Drawing.Size(410, 45);
this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem31.TextVisible = false;
@@ -1747,15 +1833,17 @@
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.repositoryItemSearchLookUpEdit1,
this.rptBl,
this.repositoryItemMemoEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1330, 176);
+ this.gcMx1.Size = new System.Drawing.Size(1664, 217);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1778,6 +1866,7 @@
this.gvMxDel,
this.gridColumn29,
this.gridColumn12});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1790,24 +1879,24 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "鏄庣粏涓婚敭";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 25;
+ this.gvMx1guid.MinWidth = 31;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.OptionsColumn.AllowEdit = false;
this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 50;
+ this.gvMx1guid.Width = 62;
//
// gvMx1qtrkGuid
//
this.gvMx1qtrkGuid.AppearanceCell.Options.UseFont = true;
this.gvMx1qtrkGuid.Caption = "澶栭敭";
this.gvMx1qtrkGuid.FieldName = "qtrkGuid";
- this.gvMx1qtrkGuid.MinWidth = 25;
+ this.gvMx1qtrkGuid.MinWidth = 31;
this.gvMx1qtrkGuid.Name = "gvMx1qtrkGuid";
this.gvMx1qtrkGuid.OptionsColumn.AllowEdit = false;
this.gvMx1qtrkGuid.OptionsColumn.ReadOnly = true;
this.gvMx1qtrkGuid.Tag = "query_a.qtrkGuid";
- this.gvMx1qtrkGuid.Width = 50;
+ this.gvMx1qtrkGuid.Width = 62;
//
// gridColumn1
//
@@ -1817,12 +1906,12 @@
this.gridColumn1.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn1.Caption = "閫夋嫨鐗╂枡";
this.gridColumn1.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "edit";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 79;
+ this.gridColumn1.Width = 99;
//
// repositoryItemSearchLookUpEdit1
//
@@ -1844,6 +1933,7 @@
this.gridColumn10,
this.gridColumn11,
this.gridColumn7});
+ this.gridView2.DetailHeight = 428;
this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
this.gridView2.Name = "gridView2";
this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
@@ -1853,91 +1943,91 @@
//
this.gridColumn8.Caption = "鐗╂枡ID";
this.gridColumn8.FieldName = "id";
- this.gridColumn8.MinWidth = 80;
+ this.gridColumn8.MinWidth = 100;
this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Width = 80;
+ this.gridColumn8.Width = 100;
//
// gridColumn9
//
this.gridColumn9.Caption = "鐗╂枡缂栫爜";
this.gridColumn9.FieldName = "itemNo";
- this.gridColumn9.MinWidth = 100;
+ this.gridColumn9.MinWidth = 62;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 1;
- this.gridColumn9.Width = 100;
+ this.gridColumn9.VisibleIndex = 0;
+ this.gridColumn9.Width = 85;
//
// gridColumn10
//
this.gridColumn10.Caption = "鐗╂枡鍚嶇О";
this.gridColumn10.FieldName = "itemName";
- this.gridColumn10.MinWidth = 120;
+ this.gridColumn10.MinWidth = 62;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 2;
- this.gridColumn10.Width = 120;
+ this.gridColumn10.VisibleIndex = 1;
+ this.gridColumn10.Width = 102;
//
// gridColumn11
//
this.gridColumn11.Caption = "鐗╂枡鍨嬪彿";
this.gridColumn11.FieldName = "itemModel";
- this.gridColumn11.MinWidth = 120;
+ this.gridColumn11.MinWidth = 62;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 3;
- this.gridColumn11.Width = 120;
+ this.gridColumn11.VisibleIndex = 2;
+ this.gridColumn11.Width = 102;
//
// gridColumn7
//
this.gridColumn7.Caption = "浣跨敤缁勭粐";
this.gridColumn7.FieldName = "fSubsidiary";
- this.gridColumn7.MinWidth = 200;
+ this.gridColumn7.MinWidth = 62;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 0;
- this.gridColumn7.Width = 200;
+ this.gridColumn7.VisibleIndex = 3;
+ this.gridColumn7.Width = 125;
//
// gvMx1qd002
//
this.gvMx1qd002.AppearanceCell.Options.UseFont = true;
this.gvMx1qd002.Caption = "鐗╂枡缂栧彿 ";
this.gvMx1qd002.FieldName = "qd002";
- this.gvMx1qd002.MinWidth = 25;
+ this.gvMx1qd002.MinWidth = 31;
this.gvMx1qd002.Name = "gvMx1qd002";
this.gvMx1qd002.OptionsColumn.AllowEdit = false;
this.gvMx1qd002.OptionsColumn.ReadOnly = true;
this.gvMx1qd002.Tag = "query_a.qd002";
this.gvMx1qd002.Visible = true;
this.gvMx1qd002.VisibleIndex = 1;
- this.gvMx1qd002.Width = 79;
+ this.gvMx1qd002.Width = 99;
//
// gvMx1qd003
//
this.gvMx1qd003.AppearanceCell.Options.UseFont = true;
this.gvMx1qd003.Caption = "鐗╂枡鍚嶇О ";
this.gvMx1qd003.FieldName = "qd003";
- this.gvMx1qd003.MinWidth = 25;
+ this.gvMx1qd003.MinWidth = 31;
this.gvMx1qd003.Name = "gvMx1qd003";
this.gvMx1qd003.OptionsColumn.AllowEdit = false;
this.gvMx1qd003.OptionsColumn.ReadOnly = true;
this.gvMx1qd003.Tag = "query_a.qd003";
this.gvMx1qd003.Visible = true;
this.gvMx1qd003.VisibleIndex = 2;
- this.gvMx1qd003.Width = 79;
+ this.gvMx1qd003.Width = 99;
//
// gvMx1qd004
//
this.gvMx1qd004.AppearanceCell.Options.UseFont = true;
this.gvMx1qd004.Caption = "瑙勬牸鍨嬪彿 ";
this.gvMx1qd004.FieldName = "qd004";
- this.gvMx1qd004.MinWidth = 25;
+ this.gvMx1qd004.MinWidth = 31;
this.gvMx1qd004.Name = "gvMx1qd004";
this.gvMx1qd004.OptionsColumn.AllowEdit = false;
this.gvMx1qd004.OptionsColumn.ReadOnly = true;
this.gvMx1qd004.Tag = "query_a.qd004";
this.gvMx1qd004.Visible = true;
this.gvMx1qd004.VisibleIndex = 3;
- this.gvMx1qd004.Width = 79;
+ this.gvMx1qd004.Width = 99;
//
// gvMx1qd007
//
@@ -1948,12 +2038,12 @@
this.gvMx1qd007.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1qd007.Caption = "鐢宠鏁伴噺 ";
this.gvMx1qd007.FieldName = "qd007";
- this.gvMx1qd007.MinWidth = 25;
+ this.gvMx1qd007.MinWidth = 31;
this.gvMx1qd007.Name = "gvMx1qd007";
this.gvMx1qd007.Tag = "edit";
this.gvMx1qd007.Visible = true;
this.gvMx1qd007.VisibleIndex = 4;
- this.gvMx1qd007.Width = 79;
+ this.gvMx1qd007.Width = 99;
//
// gvMx1qd010
//
@@ -1964,78 +2054,78 @@
this.gvMx1qd010.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1qd010.Caption = "澶囨敞 ";
this.gvMx1qd010.FieldName = "qd010";
- this.gvMx1qd010.MinWidth = 25;
+ this.gvMx1qd010.MinWidth = 31;
this.gvMx1qd010.Name = "gvMx1qd010";
this.gvMx1qd010.Tag = "edit";
this.gvMx1qd010.Visible = true;
this.gvMx1qd010.VisibleIndex = 5;
- this.gvMx1qd010.Width = 79;
+ this.gvMx1qd010.Width = 99;
//
// gridColumn15
//
this.gridColumn15.Caption = "宸叉墦鍗版�婚噺";
this.gridColumn15.FieldName = "ydy";
- this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.MinWidth = 31;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 7;
- this.gridColumn15.Width = 140;
+ this.gridColumn15.VisibleIndex = 6;
+ this.gridColumn15.Width = 175;
//
// gridColumn16
//
this.gridColumn16.Caption = "鍙墦鍗版�婚噺";
this.gridColumn16.FieldName = "kdy";
- this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.MinWidth = 31;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 8;
- this.gridColumn16.Width = 140;
+ this.gridColumn16.VisibleIndex = 7;
+ this.gridColumn16.Width = 175;
//
// gvMx1qd008
//
this.gvMx1qd008.AppearanceCell.Options.UseFont = true;
this.gvMx1qd008.Caption = "宸插叆鏁伴噺 ";
this.gvMx1qd008.FieldName = "qd008";
- this.gvMx1qd008.MinWidth = 25;
+ this.gvMx1qd008.MinWidth = 31;
this.gvMx1qd008.Name = "gvMx1qd008";
this.gvMx1qd008.OptionsColumn.AllowEdit = false;
this.gvMx1qd008.OptionsColumn.ReadOnly = true;
this.gvMx1qd008.Tag = "query_a.qd008";
this.gvMx1qd008.Visible = true;
- this.gvMx1qd008.VisibleIndex = 9;
- this.gvMx1qd008.Width = 140;
+ this.gvMx1qd008.VisibleIndex = 8;
+ this.gvMx1qd008.Width = 175;
//
// gvMx1qd009
//
this.gvMx1qd009.AppearanceCell.Options.UseFont = true;
this.gvMx1qd009.Caption = "鍗曚綅 ";
this.gvMx1qd009.FieldName = "kcDw";
- this.gvMx1qd009.MinWidth = 25;
+ this.gvMx1qd009.MinWidth = 31;
this.gvMx1qd009.Name = "gvMx1qd009";
this.gvMx1qd009.OptionsColumn.AllowEdit = false;
this.gvMx1qd009.OptionsColumn.ReadOnly = true;
this.gvMx1qd009.Tag = "query_a.qd009";
this.gvMx1qd009.Visible = true;
- this.gvMx1qd009.VisibleIndex = 10;
- this.gvMx1qd009.Width = 140;
+ this.gvMx1qd009.VisibleIndex = 9;
+ this.gvMx1qd009.Width = 175;
//
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 25;
+ this.gvMxDel.MinWidth = 31;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 11;
- this.gvMxDel.Width = 166;
+ this.gvMxDel.VisibleIndex = 10;
+ this.gvMxDel.Width = 207;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -2049,19 +2139,17 @@
this.gridColumn29.Caption = "閫夋嫨涓嶈壇绫诲瀷";
this.gridColumn29.ColumnEdit = this.rptBl;
this.gridColumn29.FieldName = "qd012";
- this.gridColumn29.MinWidth = 80;
+ this.gridColumn29.MinWidth = 100;
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.Tag = "edit";
- this.gridColumn29.Visible = true;
- this.gridColumn29.VisibleIndex = 6;
- this.gridColumn29.Width = 80;
+ this.gridColumn29.Width = 100;
//
// rptBl
//
this.rptBl.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptBl.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptBl.Name = "rptBl";
this.rptBl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBl_ButtonClick);
//
@@ -2069,9 +2157,9 @@
//
this.gridColumn12.Caption = "鐗╂枡ID";
this.gridColumn12.FieldName = "itemId";
- this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.MinWidth = 31;
this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.Width = 50;
+ this.gridColumn12.Width = 62;
//
// repositoryItemMemoEdit1
//
@@ -2080,17 +2168,20 @@
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
+ this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1330, 319);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1663, 387);
this.xtraTabPage3.Text = "宸叉墦鍗版潯鐮佹槑缁�";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1330, 319);
+ this.gcMx2.Size = new System.Drawing.Size(1663, 387);
this.gcMx2.TabIndex = 2;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2112,6 +2203,7 @@
this.gridColumn18,
this.gridColumn19,
this.gridColumn20});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -2123,168 +2215,160 @@
this.gridColumn2.AppearanceCell.Options.UseFont = true;
this.gridColumn2.Caption = "guid";
this.gridColumn2.FieldName = "guid";
- this.gridColumn2.MinWidth = 50;
+ this.gridColumn2.MinWidth = 62;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Tag = "query_a.guid";
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 117;
//
// gvMx1itemBarcode
//
this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx1itemBarcode.FieldName = "itemBarcode";
- this.gvMx1itemBarcode.MinWidth = 25;
+ this.gvMx1itemBarcode.MinWidth = 31;
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
this.gvMx1itemBarcode.VisibleIndex = 0;
- this.gvMx1itemBarcode.Width = 300;
+ this.gvMx1itemBarcode.Width = 375;
//
// gridColumn4
//
this.gridColumn4.Caption = "鐗╂枡缂栫爜";
this.gridColumn4.FieldName = "itemNo";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 1;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 117;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡鍚嶇О";
this.gridColumn3.FieldName = "itemName";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 2;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gridColumn5
//
this.gridColumn5.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn5.FieldName = "itemModel";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 3;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// gvMx1quantity
//
this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
this.gvMx1quantity.Caption = "鏁伴噺";
this.gvMx1quantity.FieldName = "quantity";
- this.gvMx1quantity.MinWidth = 50;
+ this.gvMx1quantity.MinWidth = 62;
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.QUANTITY";
this.gvMx1quantity.Visible = true;
this.gvMx1quantity.VisibleIndex = 4;
- this.gvMx1quantity.Width = 94;
+ this.gvMx1quantity.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "鍗曚綅";
this.gridColumn6.FieldName = "dwName";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 5;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// gvMx1createBy
//
this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
this.gvMx1createBy.Caption = "鍒涘缓浜�";
this.gvMx1createBy.FieldName = "createBy";
- this.gvMx1createBy.MinWidth = 25;
+ this.gvMx1createBy.MinWidth = 31;
this.gvMx1createBy.Name = "gvMx1createBy";
this.gvMx1createBy.Tag = "query_a.CREATE_BY";
this.gvMx1createBy.Visible = true;
this.gvMx1createBy.VisibleIndex = 6;
- this.gvMx1createBy.Width = 94;
+ this.gvMx1createBy.Width = 117;
//
// gvMx1lotDate
//
this.gvMx1lotDate.AppearanceCell.Options.UseFont = true;
this.gvMx1lotDate.Caption = "鍒涘缓鏃ユ湡";
this.gvMx1lotDate.FieldName = "createDate";
- this.gvMx1lotDate.MinWidth = 25;
+ this.gvMx1lotDate.MinWidth = 31;
this.gvMx1lotDate.Name = "gvMx1lotDate";
this.gvMx1lotDate.Tag = "query_a.LOT_DATE";
this.gvMx1lotDate.Visible = true;
this.gvMx1lotDate.VisibleIndex = 7;
- this.gvMx1lotDate.Width = 94;
+ this.gvMx1lotDate.Width = 117;
//
// gridColumn17
//
this.gridColumn17.Caption = "鏄惁鍏ュ簱";
this.gridColumn17.FieldName = "isRk";
- this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.MinWidth = 31;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 8;
- this.gridColumn17.Width = 94;
+ this.gridColumn17.Width = 117;
//
// gridColumn18
//
this.gridColumn18.Caption = "鍏ュ簱浜�";
- this.gridColumn18.FieldName = "rkUser";
- this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.FieldName = "rkUserName";
+ this.gridColumn18.MinWidth = 31;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 9;
- this.gridColumn18.Width = 94;
+ this.gridColumn18.Width = 117;
//
// gridColumn19
//
this.gridColumn19.Caption = "鍏ュ簱鏃ユ湡";
this.gridColumn19.FieldName = "rkDate";
- this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.MinWidth = 31;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 10;
- this.gridColumn19.Width = 94;
+ this.gridColumn19.Width = 117;
//
// gridColumn20
//
this.gridColumn20.Caption = "鍏ュ簱浣�";
this.gridColumn20.FieldName = "rkPositon";
- this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.MinWidth = 31;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 11;
- this.gridColumn20.Width = 94;
+ this.gridColumn20.Width = 117;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(951, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(1189, 67);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.Size = new System.Drawing.Size(125, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 5;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn28
- //
- this.gridColumn28.Caption = "鍏ュ簱绫诲瀷";
- this.gridColumn28.FieldName = "qtlx";
- this.gridColumn28.MinWidth = 25;
- this.gridColumn28.Name = "gridColumn28";
- this.gridColumn28.Visible = true;
- this.gridColumn28.VisibleIndex = 4;
- this.gridColumn28.Width = 94;
- //
// Frm_MesItemQtrk
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1334, 682);
+ this.ClientSize = new System.Drawing.Size(1668, 834);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_MesItemQtrk";
this.Text = "鍏跺畠鍏ュ簱鐢宠";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -2307,17 +2391,17 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_qt010.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt016.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt016Name.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qtck.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt002.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt005.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt001.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt030Name.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt028.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt034.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qt034Name.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).EndInit();
@@ -2349,6 +2433,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2431,7 +2516,7 @@
private UserControl.UcLookCk txt_qt008;
private DevExpress.XtraEditors.ComboBoxEdit txt_qt019;
private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.TextEdit txt_qt016;
+ private DevExpress.XtraEditors.TextEdit txt_qt016Name;
private DevExpress.XtraEditors.TextEdit txt_qt010;
private DevExpress.XtraEditors.TextEdit txt_qt002;
private DevExpress.XtraEditors.TextEdit txt_qtck;
@@ -2498,10 +2583,10 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
- private DevExpress.XtraEditors.TextEdit txt_qt030;
+ private DevExpress.XtraEditors.TextEdit txt_qt030Name;
private DevExpress.XtraEditors.TextEdit txt_qt029;
private DevExpress.XtraEditors.CheckEdit txt_qt028;
- private DevExpress.XtraEditors.TextEdit txt_qt034;
+ private DevExpress.XtraEditors.TextEdit txt_qt034Name;
private DevExpress.XtraEditors.TextEdit txt_qt033;
private DevExpress.XtraEditors.CheckEdit txt_qt032;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
@@ -2560,5 +2645,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+ private UserControl.UcBtnPrintAll ucBtnPrintAll1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index 1ed4291..c4d2b88 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -41,6 +41,8 @@
this.toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick;
this.toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick;
this.toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick;
+ toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
+ toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -69,34 +71,61 @@
txt_qt009.getSuppler(_orgId, _ucBm);
txt_qt018.getSuppler(_orgId, _ucGys);
txt_qt008.getSuppler(_orgId, _ucCk);
- System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
- sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'");
- var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
- var json = JsonConvert.SerializeObject(_obj);
- try
- {
- var strReturn = UtilityHelper.HttpPost("",
- "MesItemsManager/GetListSelect", json);
- var rtn = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = rtn.rtnData.list;
- this.repositoryItemSearchLookUpEdit1.DataSource = dt;
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
- }
+ _bindLookSearch(txt_qt035.Text.Trim(), "", "");
+
};
//閫夋嫨婧愬崟鏄庣粏
txt_qt035.ButtonClick += (s, e) =>
{
- string strSrmNo = "";
- SelectDaa frm = new SelectDaa();
+ string _orgId = txt_qt022.GetId();
+ SelectDaa frm = new SelectDaa(_orgId);
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<dynamic>();
lst = ee.DynamicList;
- strSrmNo = lst[0].guid;
+ string strSrmNo = lst[0].guid;
+ string strGdlx = lst[0].gdlx;
+ string strGdlxWlid = lst[0].gdlxWlid;
txt_qt035.Text = strSrmNo;
+ _bindLookSearch(txt_qt035.Text.Trim(), strGdlx, strGdlxWlid);
+ #region 閫夋嫨宸ュ崟鍚庡甫鍑轰笅闈㈢殑鐗╂枡 2025-09-27
+ //try
+ //{
+ // var _obj = new
+ // {
+ // strDaaNo = strSrmNo,//涓诲缓
+ // };
+ // var strReturn = UtilityHelper.HttpPost("",
+ // "WomdaaManager/SelectDaaMx",
+ // JsonConvert.SerializeObject(_obj));
+ // var dt = UtilityHelper.ReturnToList(strReturn);
+ // DataTable _newTable = dt.rtnData;
+ // DataTable _oldTable = (DataTable)gcMx1.DataSource;
+ // foreach (DataRow dddddd in _newTable.Rows)
+ // {
+ // DataRow _row = _oldTable.NewRow();
+ // _row["qd002"] = dddddd["itemNo"].ToString();
+ // _row["qd003"] = dddddd["itemName"].ToString();
+ // _row["qd004"] = dddddd["itemModel"].ToString();
+ // _row["kcDw"] = dddddd["dwName"].ToString();
+ // _row["itemId"] = dddddd["itemId"].ToString();
+ // _row["qd007"] = dddddd["sl"].ToString();
+ // _row["qd010"] = dddddd["bz"].ToString();
+ // _row["qd012"] = dddddd["bllx"].ToString();
+ // // _oldTable.ImportRow(_row);
+ // _oldTable.Rows.Add(_row);
+ // }
+ // gcMx1.BindingContext = new BindingContext();
+ // gcMx1.DataSource = _oldTable;
+ // gcMx1.ForceInitialize();
+ // gvMx1.BestFitColumns();
+ // Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+ //}
+ //catch (Exception ex)
+ //{
+ // MessageBox.Show(ex.Message);
+ //}
+ #endregion
};
frm.ShowDialog();
};
@@ -184,6 +213,45 @@
{
Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
+ //鍏ㄩ儴鎵撳嵃
+ ucBtnPrintAll1.btnPrintClick += (s, e) =>
+ {
+ this.ucBtnPrintAll1.rptType = "";
+ this.ucBtnPrintAll1.mxList = null;
+ if (string.IsNullOrEmpty(lbGuid.Text.Trim()))
+ {
+ MsgHelper.ShowError("鎻愮ず锛氭墦鍗板墠璇峰厛淇濆瓨鍗曟嵁锛�");
+ return;
+ }
+ getModel(lbGuid.Text.Trim());
+ List<dynamic> lst = new List<dynamic>();
+ DataTable dt = (DataTable)gcMx1.DataSource;
+ foreach (DataRow row in dt.Rows)
+ {
+ string guid = row["guid"].ToString();
+ string psnQty = row["kdy"].ToString();
+ if (string.IsNullOrEmpty(psnQty))
+ {
+ continue;
+ }
+ if (psnQty == "0")
+ {
+ continue;
+ }
+ lst.Add(new
+ {
+ guid = guid,
+ kdy = psnQty,
+ });
+ }
+ if (lst.Count <= 0)
+ {
+ MsgHelper.ShowError("鎻愮ず锛氭殏鏃犲彲鎵撳嵃鐨勭墿鏂欙紒");
+ return;
+ }
+ this.ucBtnPrintAll1.rptType = "rpt_Qtrk";
+ this.ucBtnPrintAll1.mxList = lst;
+ };
#region 2025-08-27 澶嶅埗beg
btnCopyXls.Click += (s, e) =>
{
@@ -238,6 +306,62 @@
}
};
#endregion
+ }
+
+
+ /// <summary>
+ /// 鏉ユ簮鏄庣粏闄愬埗锛�
+ /// </summary>
+ /// <param name="strGdlx">宸ュ崟绫诲瀷锛屽鏋滄槸缁翠慨锛屾牴鎹墿鏂欐壘</param>
+ private void _bindLookSearch(string daaNo, string strGdlx, string gdlxWlid)
+ {
+ System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
+ sbWhere.Append(" and a.FSubsidiary ='" + txt_qt022.GetId() + "'");
+ if (daaNo.Trim().Length > 0)
+ {
+ if (strGdlx == "W-缁翠慨杩斿伐" || strGdlx == "C-鎷嗘満杩斿伐")
+ {
+ sbWhere.Append(" and a.item_id in (");
+ sbWhere.Append(" select dab.dab003 from WOMDAA daa left join WOMDAB dab on daa.guid=dab.daaGuid ");
+ sbWhere.Append(" where daa.guid=( select top 1 ddddd.guid as dddddGuid from WOMDAA ddddd where ddddd.daa002='" + gdlxWlid + "' and ddddd.daa025 in('F-閲忎骇','S-璇曚骇') order by ddddd.daa001 desc )");
+ sbWhere.Append(" )");
+ }
+ else
+ {
+ sbWhere.Append(" and a.item_id in (");
+ sbWhere.Append(" select dab.dab003 from WOMDAB dab where dab.dab001 = '" + txt_qt035.Text.Trim() + "'");
+ sbWhere.Append(" )");
+ }
+ }
+ var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
+ var json = JsonConvert.SerializeObject(_obj);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "MesItemsManager/GetListSelect", json);
+ var rtn = UtilityHelper.ReturnToTablePage(strReturn);
+ DataTable dt = rtn.rtnData.list;
+ //濡傛灉娌℃湁锛屽啀璇讳竴閬�
+ if (dt == null || dt.Rows.Count <= 1)
+ {
+ _bindLookSearch("", "", "");
+ }
+ else
+ {
+ this.gridView2.IndicatorWidth = 60;
+ this.gridView2.CustomDrawRowIndicator += (ss, ee) =>
+ {
+ if (ee.Info.IsRowIndicator && ee.RowHandle >= 0)
+ ee.Info.DisplayText = (ee.RowHandle + 1).ToString();
+ };
+ this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+ // repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+ //repositoryItemSearchLookUpEdit1.PopupFormSize = new System.Drawing.Size(500, 300);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -630,6 +754,8 @@
_ucHzlx = dy.qt023;
_ucHz = dy.qt024;
lbGuid.Text = strGuid;
+ ucLookHuoZhu1.SetHzId(_ucHz);
+ ucLookHuoZhu1.SetHzLx(_ucHzlx);
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
gvList.Add(gvMx2);
@@ -640,6 +766,7 @@
_ucHzlx = "";
_ucHz = "";
ucLookHuoZhu1.Enabled = isEdit;
+
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -755,6 +882,12 @@
}
}
+ private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
+ {
+ _toolCk(2);
+ }
+
+
/// <summary>
/// 瀹℃牳浜嬩欢
/// </summary>
@@ -829,6 +962,9 @@
break;
case 0:
strMsg = "鍙嶅鏍�";
+ break;
+ case 2:
+ strMsg = "瀹岀粨";
break;
case 30:
strMsg = "璐㈠姟瀹℃牳";
@@ -946,5 +1082,27 @@
txt_iCount_1.Text = "";
}
}
+
+ private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
+ {
+ //guidKey, rptParameter
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_qtck, gridView1, "qtck");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ this.toolBarMenu1.rptParameter = "rpt_QTRKSQ{"
+ + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "}";
+ this.toolBarMenu1.guidKey = rowGuid;
+
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.resx b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.resx
index 7c9d60d..b21ce2d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.resx
@@ -122,17 +122,17 @@
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE1vZGVsO0NvcHk7Q29weU1vZGVs
- O4ktWcsAAAJgSURBVDhPjdFdSFNhHMfx1XQvbhokvdx00X3ddlEEQRB0WzeRvYBFkESRWVgstZpz5ZL5
- Oo0CaysbFBlWSos2hroU1wsWmFA3WelyO9s82862s/36P4+4zqKLDnyQB5//9zx7jgpAgdFoVHc6g75u
- 11t0ud6RIDqcQbQz96ZgJ7bb437ap1mZ+TtQ2uGcQj4PkudyTG6ZTG7emQTt0xcC9KwialKi1WoNg54Z
- SJIEIZrgwkICkWgKMTGDdDaHG30BFihTBtSW3oDP2vcGLb0TJACLYwzNjgDM5FrPGG4NBBESREiZHCw9
- oyxgUAZKmx2jRcdWHp0du9Hux49fUaTSMpra/SxgVAY0VztZIA8xmeWWkjIXF2V+bJPNi2/zAhKSDFOb
- lwXKlQFtfauXvzGWyCLKiFkISxmOvfWs+SW+zC0iTv+7YPWwQIUyoDvf4uHHZQMRuqwI/Y1RRExl6XfL
- ePZ6BqFwHIlUBi98n6HX6ytproSwy1eVnWp8jqycRyiaJhIWBInelsHcyCBmG2oKPpj3I9C6owgLGE6a
- hiiQwzwNRuJpGk4jHEti9nIN4HVxKdd1DBzaDAgPufi0ma954PjFp8jQZf2MLH/vu8OfcODKSMEJ+znU
- 9W8p8n346J9Add0Tfttx9hUSEvaccWNCBOeeDmFf/SYsop8b/9rE18qArur0fd+R2sc4XPsI7qH3PNDw
- aoGr7p7gA86PO7lLD7byddfejbDuXm9jgdVETyrIGrLhfwK0by3R8G+pRI9uW5UDSruOrSuy/WBlGx9m
- zz8CKycyKpQrsLWW0D6V6jdzUIrq8TztCAAAAABJRU5ErkJggg==
+ O4ktWcsAAAJzSURBVDhPjZNLSFRhFMdPmY6jV4Okx6ZF+9q2KIIgCNrWJrIHWARJFJmFhanV+ChNfI9G
+ gTlTJhQZVkpGMwzqZDg9sMCE2mSlk86dud7r3Lmvf3yf43QHWvTBb3Hgnt/355z7EQBaQRCEjFZPyN/u
+ fYc273u0eUNo8YTQzOiZQFPPBBrujAUEQcha6Uk1JwWZLZ4JWBZgWRbHZJjLGKaFW3ffQhAEZ0pARKuI
+ KIOI1jgcjtz+4SmoqgoxqnAWRAWRaBwxWUNCN3GzK8gEOXZBRk1n0F/X9Qa1neOo7Qyixj2KancQLncQ
+ 1ztGcbs3hLAoQ9VM1HSMMEGuXZBZ7R5Ji22PzmJXNgXw83cU8YSBquYAEwh2Qda1ViawIC/pnMUlgyPJ
+ Bo9d3uDD91kRimqgvNHHBHl2gaOs3sdvjCk6ogxZh7iocdit51wv8XVmHpKi42LdMBPk2wXZF2qHeVzW
+ EJE1RBY1xGQdclyHqhl49noK4QUJSlzDC/8XOJ3OAjb05PAp53Tlc+iGhXA0gXBUxZyoQlI0zAz1Y7qi
+ OMVH1wEE63emwQS5p8oHoBsmZkUVESkBSUlgIbaE6SvFgM/LiXtvoPfwFkB8yJEmXbzmghOXnkLTTfyK
+ LO/73uBnHLw6lOJk03mUdm9N48fgsb+CotInfNoS24KiYu/ZPozL4PRNhrG/bDPm0c0Z+1bFa7sgu/DM
+ ff/Rksc4UvIIfQMfuKDi1RynqH2cN3g+7eJcfrCN1237NqFuz4YGJlhNRE4iyieitUS08X8ERLSO/UNp
+ jym51+zthW7Y2X18fRo7DhU08mZ2/iFYSSTYyLPBakfyO/oDc1CK6m0Ap7gAAAAASUVORK5CYII=
</value>
</data>
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
index aeb42ca..0e9fd4c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
@@ -66,6 +66,7 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -74,7 +75,7 @@
this.txt_ckName = new DevExpress.XtraEditors.TextEdit();
this.txt_sqRemark = new DevExpress.XtraEditors.TextEdit();
this.txt_hz = new DevExpress.XtraEditors.TextEdit();
- this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkUserName = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_lyfx = new DevExpress.XtraEditors.TextEdit();
this.txt_hzlx = new DevExpress.XtraEditors.TextEdit();
@@ -82,12 +83,12 @@
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
this.txt_abtNo = new DevExpress.XtraEditors.TextEdit();
this.txt_djlx = new DevExpress.XtraEditors.TextEdit();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
this.txt_kcOrg = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
- this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_lastupdateByName = new DevExpress.XtraEditors.TextEdit();
this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -135,9 +136,10 @@
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.xtraTabPageReport = new DevExpress.XtraTab.XtraTabPage();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.ucRptQtrkdj1 = new Gs.DevApp.DevFrm.Rpt.UcRptQtrkdj();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -160,7 +162,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_hz.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lyfx.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_hzlx.Properties)).BeginInit();
@@ -168,12 +170,12 @@
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_abtNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_djlx.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateByName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -203,6 +205,7 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ this.xtraTabPageReport.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
@@ -215,6 +218,7 @@
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(4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(1348, 80);
@@ -232,7 +236,8 @@
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
- this.xtraTabPage2});
+ this.xtraTabPage2,
+ this.xtraTabPageReport});
//
// xtraTabPage1
//
@@ -384,7 +389,7 @@
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜� ";
- this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.FieldName = "cjPeople";
this.gv_createBy.MinWidth = 50;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
@@ -410,7 +415,7 @@
//
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
- this.gv_lastupdateBy.FieldName = "lastupdateBy";
+ this.gv_lastupdateBy.FieldName = "gxPeople";
this.gv_lastupdateBy.MinWidth = 25;
this.gv_lastupdateBy.Name = "gv_lastupdateBy";
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
@@ -459,7 +464,7 @@
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
- this.gv_checkUser.FieldName = "checkUser";
+ this.gv_checkUser.FieldName = "shPeople";
this.gv_checkUser.MinWidth = 25;
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
@@ -552,6 +557,16 @@
this.gridColumn10.VisibleIndex = 19;
this.gridColumn10.Width = 94;
//
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "鍏ュ簱绫诲瀷";
+ this.gridColumn13.FieldName = "qtlx";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 3;
+ this.gridColumn13.Width = 94;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -598,7 +613,7 @@
this.layoutMx1.Controls.Add(this.txt_ckName);
this.layoutMx1.Controls.Add(this.txt_sqRemark);
this.layoutMx1.Controls.Add(this.txt_hz);
- this.layoutMx1.Controls.Add(this.txt_checkUser);
+ this.layoutMx1.Controls.Add(this.txt_checkUserName);
this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Controls.Add(this.txt_lyfx);
this.layoutMx1.Controls.Add(this.txt_hzlx);
@@ -606,12 +621,12 @@
this.layoutMx1.Controls.Add(this.txt_billNo);
this.layoutMx1.Controls.Add(this.txt_abtNo);
this.layoutMx1.Controls.Add(this.txt_djlx);
- this.layoutMx1.Controls.Add(this.txt_createBy);
+ this.layoutMx1.Controls.Add(this.txt_createByName);
this.layoutMx1.Controls.Add(this.txt_dptName);
this.layoutMx1.Controls.Add(this.txt_kcOrg);
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_status);
- this.layoutMx1.Controls.Add(this.txt_lastupdateBy);
+ this.layoutMx1.Controls.Add(this.txt_lastupdateByName);
this.layoutMx1.Controls.Add(this.txt_lastupdateDate);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
@@ -659,14 +674,14 @@
this.txt_hz.StyleController = this.layoutMx1;
this.txt_hz.TabIndex = 602;
//
- // txt_checkUser
+ // txt_checkUserName
//
- this.txt_checkUser.Location = new System.Drawing.Point(1077, 12);
- this.txt_checkUser.Name = "txt_checkUser";
- this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(257, 24);
- this.txt_checkUser.StyleController = this.layoutMx1;
- this.txt_checkUser.TabIndex = 608;
+ this.txt_checkUserName.Location = new System.Drawing.Point(1077, 12);
+ this.txt_checkUserName.Name = "txt_checkUserName";
+ this.txt_checkUserName.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkUserName.Size = new System.Drawing.Size(257, 24);
+ this.txt_checkUserName.StyleController = this.layoutMx1;
+ this.txt_checkUserName.TabIndex = 608;
//
// txt_createDate
//
@@ -731,14 +746,14 @@
this.txt_djlx.StyleController = this.layoutMx1;
this.txt_djlx.TabIndex = 598;
//
- // txt_createBy
+ // txt_createByName
//
- this.txt_createBy.Location = new System.Drawing.Point(746, 74);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(255, 24);
- this.txt_createBy.StyleController = this.layoutMx1;
- this.txt_createBy.TabIndex = 219;
+ this.txt_createByName.Location = new System.Drawing.Point(746, 74);
+ this.txt_createByName.Name = "txt_createByName";
+ this.txt_createByName.Properties.Appearance.Options.UseFont = true;
+ this.txt_createByName.Size = new System.Drawing.Size(255, 24);
+ this.txt_createByName.StyleController = this.layoutMx1;
+ this.txt_createByName.TabIndex = 219;
//
// txt_dptName
//
@@ -776,14 +791,14 @@
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 609;
//
- // txt_lastupdateBy
+ // txt_lastupdateByName
//
- this.txt_lastupdateBy.Location = new System.Drawing.Point(1077, 105);
- this.txt_lastupdateBy.Name = "txt_lastupdateBy";
- this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateBy.Size = new System.Drawing.Size(257, 24);
- this.txt_lastupdateBy.StyleController = this.layoutMx1;
- this.txt_lastupdateBy.TabIndex = 610;
+ this.txt_lastupdateByName.Location = new System.Drawing.Point(1077, 105);
+ this.txt_lastupdateByName.Name = "txt_lastupdateByName";
+ this.txt_lastupdateByName.Properties.Appearance.Options.UseFont = true;
+ this.txt_lastupdateByName.Size = new System.Drawing.Size(257, 24);
+ this.txt_lastupdateByName.StyleController = this.layoutMx1;
+ this.txt_lastupdateByName.TabIndex = 610;
//
// txt_lastupdateDate
//
@@ -894,7 +909,7 @@
//
// layoutControlItem4
//
- this.layoutControlItem4.Control = this.txt_checkUser;
+ this.layoutControlItem4.Control = this.txt_checkUserName;
this.layoutControlItem4.Location = new System.Drawing.Point(993, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -968,7 +983,7 @@
//
// layoutControlItem11
//
- this.layoutControlItem11.Control = this.txt_createBy;
+ this.layoutControlItem11.Control = this.txt_createByName;
this.layoutControlItem11.Location = new System.Drawing.Point(662, 62);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -1034,7 +1049,7 @@
//
// layoutControlItem17
//
- this.layoutControlItem17.Control = this.txt_lastupdateBy;
+ this.layoutControlItem17.Control = this.txt_lastupdateByName;
this.layoutControlItem17.Location = new System.Drawing.Point(993, 93);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1203,7 +1218,7 @@
//
this.gridColumn1.AppearanceCell.Options.UseFont = true;
this.gridColumn1.Caption = "寤虹珛鑰�";
- this.gridColumn1.FieldName = "createBy";
+ this.gridColumn1.FieldName = "createByName";
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
@@ -1260,7 +1275,7 @@
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡缂栫爜";
- this.gridColumn3.FieldName = "itemNo";
+ this.gridColumn3.FieldName = "itemNo2";
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
@@ -1355,6 +1370,14 @@
this.gridColumn12.VisibleIndex = 8;
this.gridColumn12.Width = 94;
//
+ // xtraTabPageReport
+ //
+ this.xtraTabPageReport.Controls.Add(this.ucRptQtrkdj1);
+ this.xtraTabPageReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
+ this.xtraTabPageReport.Name = "xtraTabPageReport";
+ this.xtraTabPageReport.Size = new System.Drawing.Size(1346, 570);
+ this.xtraTabPageReport.Text = "鎶ヨ〃";
+ //
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1366,15 +1389,13 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn13
+ // ucRptQtrkdj1
//
- this.gridColumn13.Caption = "鍏ュ簱绫诲瀷";
- this.gridColumn13.FieldName = "qtlx";
- this.gridColumn13.MinWidth = 25;
- this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 3;
- this.gridColumn13.Width = 94;
+ this.ucRptQtrkdj1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ucRptQtrkdj1.Location = new System.Drawing.Point(0, 0);
+ this.ucRptQtrkdj1.Name = "ucRptQtrkdj1";
+ this.ucRptQtrkdj1.Size = new System.Drawing.Size(1346, 570);
+ this.ucRptQtrkdj1.TabIndex = 0;
//
// Frm_MesItemQtrkDj
//
@@ -1408,7 +1429,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_hz.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lyfx.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_hzlx.Properties)).EndInit();
@@ -1416,12 +1437,12 @@
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_abtNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_djlx.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateByName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -1451,6 +1472,7 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ this.xtraTabPageReport.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -1488,7 +1510,7 @@
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraEditors.TextEdit txt_ckName;
- private DevExpress.XtraEditors.TextEdit txt_checkUser;
+ private DevExpress.XtraEditors.TextEdit txt_checkUserName;
private DevExpress.XtraEditors.TextEdit txt_lyfx;
private DevExpress.XtraEditors.TextEdit txt_hz;
private DevExpress.XtraEditors.TextEdit txt_hzlx;
@@ -1500,7 +1522,7 @@
private DevExpress.XtraEditors.TextEdit txt_abtNo;
private DevExpress.XtraEditors.TextEdit txt_sqRemark;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraEditors.TextEdit txt_createBy;
+ private DevExpress.XtraEditors.TextEdit txt_createByName;
private DevExpress.XtraEditors.TextEdit txt_billNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
@@ -1516,7 +1538,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
+ private DevExpress.XtraEditors.TextEdit txt_lastupdateByName;
private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
@@ -1555,5 +1577,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPageReport;
+ private Rpt.UcRptQtrkdj ucRptQtrkdj1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
index aca9861..85104a3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
@@ -1,4 +1,5 @@
-锘縰sing Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -27,16 +28,20 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (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);
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- }, lbGuid);
+ }, lbGuid, toolBarMenu1
+ , () =>
+ {
+ ucRptQtrkdj1.Initialize();
+ });
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
@@ -76,12 +81,17 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ return;
+ }
+ ucRptQtrkdj1.ToolBarMenu1_btnQueryClick(sender, e);
}
/// <summary>
/// 鏌ヨ鍥炶皟
@@ -272,7 +282,8 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
- };
+ }
+ ;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtdj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtdj.Designer.cs
new file mode 100644
index 0000000..b4b18f3
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtdj.Designer.cs
@@ -0,0 +1,329 @@
+锘縩amespace Gs.DevApp.DevFrm.Rpt
+{
+ partial class UcRptQtdj
+ {
+ /// <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.components = new System.ComponentModel.Container();
+ this.gcMain1Report = new DevExpress.XtraGrid.GridControl();
+ this.gridView1Report = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depotSectionsCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_ownerType = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_ownerId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_indepUserCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_indepDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).BeginInit();
+ this.SuspendLayout();
+ //
+ // gcMain1Report
+ //
+ this.gcMain1Report.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1Report.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1Report.MainView = this.gridView1Report;
+ this.gcMain1Report.Name = "gcMain1Report";
+ this.gcMain1Report.Size = new System.Drawing.Size(1339, 644);
+ this.gcMain1Report.TabIndex = 2;
+ this.gcMain1Report.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1Report});
+ //
+ // gridView1Report
+ //
+ this.gridView1Report.Appearance.Row.Options.UseFont = true;
+ this.gridView1Report.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_guid,
+ this.gridColumn12,
+ this.gridColumn3,
+ this.gridColumn2,
+ this.gridColumn4,
+ this.gv_quantity,
+ this.gv_depotId,
+ this.gridColumn6,
+ this.gridColumn1,
+ this.gv_depotSectionsCode,
+ this.gv_ownerType,
+ this.gv_ownerId,
+ this.gv_indepUserCode,
+ this.gv_indepDate,
+ this.gridColumn5,
+ this.gridColumn7});
+ this.gridView1Report.GridControl = this.gcMain1Report;
+ this.gridView1Report.IndicatorWidth = 50;
+ this.gridView1Report.Name = "gridView1Report";
+ this.gridView1Report.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1Report.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1Report.OptionsView.ShowFooter = true;
+ this.gridView1Report.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_guid
+ //
+ this.gv_guid.AppearanceCell.Options.UseFont = true;
+ this.gv_guid.Caption = "鏄庣粏琛ㄤ富閿瓽UID";
+ this.gv_guid.FieldName = "guid";
+ this.gv_guid.MinWidth = 50;
+ this.gv_guid.Name = "gv_guid";
+ this.gv_guid.OptionsColumn.AllowEdit = false;
+ this.gv_guid.Tag = "query_a.guid";
+ this.gv_guid.Width = 94;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "涓昏〃涓婚敭Guid";
+ this.gridColumn12.FieldName = "hGuid";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn3.FieldName = "itemNo";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.Width = 74;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn2.FieldName = "itemName";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 3;
+ this.gridColumn2.Width = 74;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "瑙勬牸鍨嬪彿";
+ this.gridColumn4.FieldName = "itemModel";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 4;
+ this.gridColumn4.Width = 74;
+ //
+ // gv_quantity
+ //
+ this.gv_quantity.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gv_quantity.AppearanceCell.Options.UseFont = true;
+ this.gv_quantity.AppearanceCell.Options.UseForeColor = true;
+ this.gv_quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gv_quantity.AppearanceHeader.Options.UseForeColor = true;
+ this.gv_quantity.Caption = "鍑哄簱鏁伴噺 ";
+ this.gv_quantity.FieldName = "ckQty";
+ this.gv_quantity.MinWidth = 50;
+ this.gv_quantity.Name = "gv_quantity";
+ this.gv_quantity.OptionsColumn.AllowEdit = false;
+ this.gv_quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "rkQty", "鍚堣={0:0.##}")});
+ this.gv_quantity.Tag = "query_a.QUANTITY";
+ this.gv_quantity.Visible = true;
+ this.gv_quantity.VisibleIndex = 5;
+ this.gv_quantity.Width = 74;
+ //
+ // gv_depotId
+ //
+ this.gv_depotId.AppearanceCell.Options.UseFont = true;
+ this.gv_depotId.Caption = "鍗曟嵁鐘舵��";
+ this.gv_depotId.FieldName = "txtColor";
+ this.gv_depotId.MinWidth = 50;
+ this.gv_depotId.Name = "gv_depotId";
+ this.gv_depotId.OptionsColumn.AllowEdit = false;
+ this.gv_depotId.Tag = "query_a.DEPOT_ID";
+ this.gv_depotId.Visible = true;
+ this.gv_depotId.VisibleIndex = 0;
+ this.gv_depotId.Width = 73;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "涓诲崟鎹師鍥�";
+ this.gridColumn6.FieldName = "zbyy";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 9;
+ this.gridColumn6.Width = 74;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鏄庣粏鍘熷洜";
+ this.gridColumn1.FieldName = "mxyy";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 10;
+ this.gridColumn1.Width = 74;
+ //
+ // gv_depotSectionsCode
+ //
+ this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true;
+ this.gv_depotSectionsCode.Caption = "浠撳簱";
+ this.gv_depotSectionsCode.FieldName = "ckName";
+ this.gv_depotSectionsCode.MinWidth = 50;
+ this.gv_depotSectionsCode.Name = "gv_depotSectionsCode";
+ this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false;
+ this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE";
+ this.gv_depotSectionsCode.Visible = true;
+ this.gv_depotSectionsCode.VisibleIndex = 6;
+ this.gv_depotSectionsCode.Width = 74;
+ //
+ // gv_ownerType
+ //
+ this.gv_ownerType.AppearanceCell.Options.UseFont = true;
+ this.gv_ownerType.Caption = "搴撳瓨缁勭粐";
+ this.gv_ownerType.FieldName = "kcOrg";
+ this.gv_ownerType.MinWidth = 50;
+ this.gv_ownerType.Name = "gv_ownerType";
+ this.gv_ownerType.OptionsColumn.AllowEdit = false;
+ this.gv_ownerType.Tag = "query_a.Owner_Type";
+ this.gv_ownerType.Visible = true;
+ this.gv_ownerType.VisibleIndex = 11;
+ this.gv_ownerType.Width = 74;
+ //
+ // gv_ownerId
+ //
+ this.gv_ownerId.AppearanceCell.Options.UseFont = true;
+ this.gv_ownerId.Caption = "鍑哄簱鍗曞彿";
+ this.gv_ownerId.FieldName = "billNo";
+ this.gv_ownerId.MinWidth = 50;
+ this.gv_ownerId.Name = "gv_ownerId";
+ this.gv_ownerId.OptionsColumn.AllowEdit = false;
+ this.gv_ownerId.Tag = "query_a.Owner_Id";
+ this.gv_ownerId.Visible = true;
+ this.gv_ownerId.VisibleIndex = 1;
+ this.gv_ownerId.Width = 74;
+ //
+ // gv_indepUserCode
+ //
+ this.gv_indepUserCode.AppearanceCell.Options.UseFont = true;
+ this.gv_indepUserCode.Caption = "鍑哄簱浜�";
+ this.gv_indepUserCode.FieldName = "userName";
+ this.gv_indepUserCode.MinWidth = 50;
+ this.gv_indepUserCode.Name = "gv_indepUserCode";
+ this.gv_indepUserCode.OptionsColumn.AllowEdit = false;
+ this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE";
+ this.gv_indepUserCode.Visible = true;
+ this.gv_indepUserCode.VisibleIndex = 7;
+ this.gv_indepUserCode.Width = 74;
+ //
+ // gv_indepDate
+ //
+ this.gv_indepDate.AppearanceCell.Options.UseFont = true;
+ this.gv_indepDate.Caption = "鍑哄簱鏃ユ湡 ";
+ this.gv_indepDate.FieldName = "createDate";
+ this.gv_indepDate.MinWidth = 10;
+ this.gv_indepDate.Name = "gv_indepDate";
+ this.gv_indepDate.OptionsColumn.AllowEdit = false;
+ this.gv_indepDate.Tag = "query_a.INDEP_DATE";
+ this.gv_indepDate.Visible = true;
+ this.gv_indepDate.VisibleIndex = 8;
+ this.gv_indepDate.Width = 80;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鐗╂枡ID";
+ this.gridColumn5.FieldName = "itemId";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsEditForm.Visible = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 12;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "鐢宠鍗曞彿";
+ this.gridColumn7.FieldName = "sqNo";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 13;
+ this.gridColumn7.Width = 94;
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 644);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(1339, 38);
+ this.pageBar1.TabIndex = 4;
+ this.pageBar1.TotalPages = 0;
+ //
+ // UcRptQtdj
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.gcMain1Report);
+ this.Controls.Add(this.pageBar1);
+ this.Name = "UcRptQtdj";
+ this.Size = new System.Drawing.Size(1339, 682);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+ private DevExpress.XtraGrid.GridControl gcMain1Report;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1Report;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_quantity;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotSectionsCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_ownerType;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_ownerId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_indepUserCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_indepDate;
+ private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtdj.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtdj.cs
new file mode 100644
index 0000000..06671bb
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtdj.cs
@@ -0,0 +1,152 @@
+锘縰sing DevExpress.XtraGrid;
+using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.Rpt
+{
+ public partial class UcRptQtdj : DevExpress.XtraEditors.XtraUserControl
+ {
+ string _webServiceName = "MesItemQtDJManager/";
+ List<FilterEntity> _filterList = new List<FilterEntity>();
+ public UcRptQtdj()
+ {
+ InitializeComponent();
+ }
+ public bool isInitialize = false;
+ /// <summary>
+ /// 杩欏拰鏅�氶〉涓嶄竴鏍�
+ /// </summary>
+ public void Initialize()
+ {
+ if (isInitialize)
+ return;
+ string _formNamespace = this.GetType().FullName;
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<GridView>();
+ gvList.Add(gridView1Report);
+ GridControl gcMain = this.Controls.Find("gcMain1Report", true).OfType<GridControl>().FirstOrDefault();
+ //UtilityHelper.GetUcXmlConfig(_formNamespace, gvList, gcMain);
+ Form parentForm = this.FindForm();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1Report, null, parentForm, "", "", (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.isInitialize = true;
+ }
+
+
+ private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1Report.Columns, gridView1Report);
+ await Task.Delay(100);
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage);
+ }
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ public void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ gridView1Report.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1Report.ActiveFilter.Clear();
+ gridView1Report.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1Report.Columns, _filterList, this.GetType().FullName);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ }
+ /// <summary>
+ /// 鏌ヨ鍥炶皟
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ {
+ _filterList = e.FilterList;
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ public void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ gcMain1Report.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
+ string json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPageReport", json);
+ ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain1Report.BindingContext = new BindingContext();
+ gridView1Report.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain1Report.DataSource = dt;
+ gcMain1Report.ForceInitialize();
+ gridView1Report.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1Report);
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain1Report, gridView1Report);
+ gridView1Report.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtdj.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtdj.resx
new file mode 100644
index 0000000..5160e8b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtdj.resx
@@ -0,0 +1,123 @@
+锘�<?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>
+ <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtrkdj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtrkdj.Designer.cs
new file mode 100644
index 0000000..b4a7bd3
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtrkdj.Designer.cs
@@ -0,0 +1,329 @@
+锘縩amespace Gs.DevApp.DevFrm.Rpt
+{
+ partial class UcRptQtrkdj
+ {
+ /// <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.components = new System.ComponentModel.Container();
+ this.gcMain1Report = new DevExpress.XtraGrid.GridControl();
+ this.gridView1Report = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depotSectionsCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_ownerType = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_ownerId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_indepUserCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_indepDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).BeginInit();
+ this.SuspendLayout();
+ //
+ // gcMain1Report
+ //
+ this.gcMain1Report.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1Report.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1Report.MainView = this.gridView1Report;
+ this.gcMain1Report.Name = "gcMain1Report";
+ this.gcMain1Report.Size = new System.Drawing.Size(1339, 644);
+ this.gcMain1Report.TabIndex = 2;
+ this.gcMain1Report.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1Report});
+ //
+ // gridView1Report
+ //
+ this.gridView1Report.Appearance.Row.Options.UseFont = true;
+ this.gridView1Report.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_guid,
+ this.gridColumn12,
+ this.gridColumn3,
+ this.gridColumn2,
+ this.gridColumn4,
+ this.gv_quantity,
+ this.gv_depotId,
+ this.gridColumn6,
+ this.gridColumn1,
+ this.gv_depotSectionsCode,
+ this.gv_ownerType,
+ this.gv_ownerId,
+ this.gv_indepUserCode,
+ this.gv_indepDate,
+ this.gridColumn5,
+ this.gridColumn7});
+ this.gridView1Report.GridControl = this.gcMain1Report;
+ this.gridView1Report.IndicatorWidth = 50;
+ this.gridView1Report.Name = "gridView1Report";
+ this.gridView1Report.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1Report.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1Report.OptionsView.ShowFooter = true;
+ this.gridView1Report.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_guid
+ //
+ this.gv_guid.AppearanceCell.Options.UseFont = true;
+ this.gv_guid.Caption = "鏄庣粏琛ㄤ富閿瓽UID";
+ this.gv_guid.FieldName = "guid";
+ this.gv_guid.MinWidth = 50;
+ this.gv_guid.Name = "gv_guid";
+ this.gv_guid.OptionsColumn.AllowEdit = false;
+ this.gv_guid.Tag = "query_a.guid";
+ this.gv_guid.Width = 94;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "涓昏〃涓婚敭Guid";
+ this.gridColumn12.FieldName = "hGuid";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn3.FieldName = "itemNo";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.Width = 74;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn2.FieldName = "itemName";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 3;
+ this.gridColumn2.Width = 74;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "瑙勬牸鍨嬪彿";
+ this.gridColumn4.FieldName = "itemModel";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 4;
+ this.gridColumn4.Width = 74;
+ //
+ // gv_quantity
+ //
+ this.gv_quantity.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gv_quantity.AppearanceCell.Options.UseFont = true;
+ this.gv_quantity.AppearanceCell.Options.UseForeColor = true;
+ this.gv_quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gv_quantity.AppearanceHeader.Options.UseForeColor = true;
+ this.gv_quantity.Caption = "鍏ュ簱鏁伴噺 ";
+ this.gv_quantity.FieldName = "rkQty";
+ this.gv_quantity.MinWidth = 50;
+ this.gv_quantity.Name = "gv_quantity";
+ this.gv_quantity.OptionsColumn.AllowEdit = false;
+ this.gv_quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "rkQty", "鍚堣={0:0.##}")});
+ this.gv_quantity.Tag = "query_a.QUANTITY";
+ this.gv_quantity.Visible = true;
+ this.gv_quantity.VisibleIndex = 5;
+ this.gv_quantity.Width = 74;
+ //
+ // gv_depotId
+ //
+ this.gv_depotId.AppearanceCell.Options.UseFont = true;
+ this.gv_depotId.Caption = "鍗曟嵁鐘舵��";
+ this.gv_depotId.FieldName = "txtColor";
+ this.gv_depotId.MinWidth = 50;
+ this.gv_depotId.Name = "gv_depotId";
+ this.gv_depotId.OptionsColumn.AllowEdit = false;
+ this.gv_depotId.Tag = "query_a.DEPOT_ID";
+ this.gv_depotId.Visible = true;
+ this.gv_depotId.VisibleIndex = 0;
+ this.gv_depotId.Width = 73;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "涓诲崟鎹師鍥�";
+ this.gridColumn6.FieldName = "zbyy";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 9;
+ this.gridColumn6.Width = 74;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鏄庣粏鍘熷洜";
+ this.gridColumn1.FieldName = "mxyy";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 10;
+ this.gridColumn1.Width = 74;
+ //
+ // gv_depotSectionsCode
+ //
+ this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true;
+ this.gv_depotSectionsCode.Caption = "浠撳簱";
+ this.gv_depotSectionsCode.FieldName = "ckName";
+ this.gv_depotSectionsCode.MinWidth = 50;
+ this.gv_depotSectionsCode.Name = "gv_depotSectionsCode";
+ this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false;
+ this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE";
+ this.gv_depotSectionsCode.Visible = true;
+ this.gv_depotSectionsCode.VisibleIndex = 6;
+ this.gv_depotSectionsCode.Width = 74;
+ //
+ // gv_ownerType
+ //
+ this.gv_ownerType.AppearanceCell.Options.UseFont = true;
+ this.gv_ownerType.Caption = "搴撳瓨缁勭粐";
+ this.gv_ownerType.FieldName = "kcOrg";
+ this.gv_ownerType.MinWidth = 50;
+ this.gv_ownerType.Name = "gv_ownerType";
+ this.gv_ownerType.OptionsColumn.AllowEdit = false;
+ this.gv_ownerType.Tag = "query_a.Owner_Type";
+ this.gv_ownerType.Visible = true;
+ this.gv_ownerType.VisibleIndex = 11;
+ this.gv_ownerType.Width = 74;
+ //
+ // gv_ownerId
+ //
+ this.gv_ownerId.AppearanceCell.Options.UseFont = true;
+ this.gv_ownerId.Caption = "鍏ュ簱鍗曞彿";
+ this.gv_ownerId.FieldName = "billNo";
+ this.gv_ownerId.MinWidth = 50;
+ this.gv_ownerId.Name = "gv_ownerId";
+ this.gv_ownerId.OptionsColumn.AllowEdit = false;
+ this.gv_ownerId.Tag = "query_a.Owner_Id";
+ this.gv_ownerId.Visible = true;
+ this.gv_ownerId.VisibleIndex = 1;
+ this.gv_ownerId.Width = 74;
+ //
+ // gv_indepUserCode
+ //
+ this.gv_indepUserCode.AppearanceCell.Options.UseFont = true;
+ this.gv_indepUserCode.Caption = "鍏ュ簱浜�";
+ this.gv_indepUserCode.FieldName = "userName";
+ this.gv_indepUserCode.MinWidth = 50;
+ this.gv_indepUserCode.Name = "gv_indepUserCode";
+ this.gv_indepUserCode.OptionsColumn.AllowEdit = false;
+ this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE";
+ this.gv_indepUserCode.Visible = true;
+ this.gv_indepUserCode.VisibleIndex = 7;
+ this.gv_indepUserCode.Width = 74;
+ //
+ // gv_indepDate
+ //
+ this.gv_indepDate.AppearanceCell.Options.UseFont = true;
+ this.gv_indepDate.Caption = "鍏ュ簱鏃ユ湡 ";
+ this.gv_indepDate.FieldName = "createDate";
+ this.gv_indepDate.MinWidth = 10;
+ this.gv_indepDate.Name = "gv_indepDate";
+ this.gv_indepDate.OptionsColumn.AllowEdit = false;
+ this.gv_indepDate.Tag = "query_a.INDEP_DATE";
+ this.gv_indepDate.Visible = true;
+ this.gv_indepDate.VisibleIndex = 8;
+ this.gv_indepDate.Width = 80;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鐗╂枡ID";
+ this.gridColumn5.FieldName = "itemId";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsEditForm.Visible = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 12;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "鐢宠鍗曞彿";
+ this.gridColumn7.FieldName = "qtck";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 13;
+ this.gridColumn7.Width = 94;
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 644);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(1339, 38);
+ this.pageBar1.TabIndex = 4;
+ this.pageBar1.TotalPages = 0;
+ //
+ // UcRptQtrkdj
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.gcMain1Report);
+ this.Controls.Add(this.pageBar1);
+ this.Name = "UcRptQtrkdj";
+ this.Size = new System.Drawing.Size(1339, 682);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+ private DevExpress.XtraGrid.GridControl gcMain1Report;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1Report;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_quantity;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotSectionsCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_ownerType;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_ownerId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_indepUserCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_indepDate;
+ private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtrkdj.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtrkdj.cs
new file mode 100644
index 0000000..9327ada
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtrkdj.cs
@@ -0,0 +1,153 @@
+锘縰sing DevExpress.XtraGrid;
+using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+
+namespace Gs.DevApp.DevFrm.Rpt
+{
+ public partial class UcRptQtrkdj : DevExpress.XtraEditors.XtraUserControl
+ {
+ string _webServiceName = "MesItemQtrkDjManager/";
+ List<FilterEntity> _filterList = new List<FilterEntity>();
+ public UcRptQtrkdj()
+ {
+ InitializeComponent();
+ }
+ public bool isInitialize = false;
+ /// <summary>
+ /// 杩欏拰鏅�氶〉涓嶄竴鏍�
+ /// </summary>
+ public void Initialize()
+ {
+ if (isInitialize)
+ return;
+ string _formNamespace = this.GetType().FullName;
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<GridView>();
+ gvList.Add(gridView1Report);
+ GridControl gcMain = this.Controls.Find("gcMain1Report", true).OfType<GridControl>().FirstOrDefault();
+ //UtilityHelper.GetUcXmlConfig(_formNamespace, gvList, gcMain);
+ Form parentForm = this.FindForm();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1Report, null, parentForm, "", "", (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.isInitialize = true;
+ }
+
+
+ private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1Report.Columns, gridView1Report);
+ await Task.Delay(100);
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage);
+ }
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ public void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ gridView1Report.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1Report.ActiveFilter.Clear();
+ gridView1Report.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1Report.Columns, _filterList, this.GetType().FullName);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ }
+ /// <summary>
+ /// 鏌ヨ鍥炶皟
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ {
+ _filterList = e.FilterList;
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ public void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ gcMain1Report.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
+ string json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPageReport", json);
+ ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain1Report.BindingContext = new BindingContext();
+ gridView1Report.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain1Report.DataSource = dt;
+ gcMain1Report.ForceInitialize();
+ gridView1Report.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1Report);
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain1Report, gridView1Report);
+ gridView1Report.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtrkdj.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtrkdj.resx
new file mode 100644
index 0000000..5160e8b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptQtrkdj.resx
@@ -0,0 +1,123 @@
+锘�<?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>
+ <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index f863882..51eed56 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -830,6 +830,18 @@
<Compile Include="DevFrm\Rpt\SysTuiSong.Designer.cs">
<DependentUpon>SysTuiSong.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Rpt\UcRptQtdj.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\UcRptQtdj.Designer.cs">
+ <DependentUpon>UcRptQtdj.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\UcRptQtrkdj.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\UcRptQtrkdj.Designer.cs">
+ <DependentUpon>UcRptQtrkdj.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Rpt\YS_iqcWeek.cs">
<SubType>Form</SubType>
</Compile>
@@ -1435,6 +1447,12 @@
</Compile>
<Compile Include="UserControl\SelectSrm.Designer.cs">
<DependentUpon>SelectSrm.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UcBtnPrintAll.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcBtnPrintAll.Designer.cs">
+ <DependentUpon>UcBtnPrintAll.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcBtnPrintOne.cs">
<SubType>UserControl</SubType>
@@ -2125,6 +2143,12 @@
<EmbeddedResource Include="DevFrm\Rpt\SysTuiSong.resx">
<DependentUpon>SysTuiSong.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\UcRptQtdj.resx">
+ <DependentUpon>UcRptQtdj.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\UcRptQtrkdj.resx">
+ <DependentUpon>UcRptQtrkdj.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\YS_iqcWeek.resx">
<DependentUpon>YS_iqcWeek.cs</DependentUpon>
</EmbeddedResource>
@@ -2420,6 +2444,9 @@
<EmbeddedResource Include="UserControl\SelectSrm.resx">
<DependentUpon>SelectSrm.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcBtnPrintAll.resx">
+ <DependentUpon>UcBtnPrintAll.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcBtnPrintOne.resx">
<DependentUpon>UcBtnPrintOne.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 9c30456..f995d5b 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1733,6 +1733,7 @@
}
public delegate void DelegateGetModel(string guid);
public delegate void DelegateGetList(int currentPage);
+ public delegate void DelegateGetUserControlList();
/// <summary>
///
@@ -1993,7 +1994,7 @@
column.Width = maxWidth;
}
}
-
+
/// <summary>
/// 璁剧疆閫夐」鍗�
/// </summary>
@@ -2002,10 +2003,24 @@
/// <param name="pageBar1"></param>
/// <param name="action"></param>
/// <param name="page"></param>
- public static void SetTabParameter(GridView gridView1, DevExpress.XtraTab.XtraTabControl xtraTabControl1, UcPageBar pageBar1, DelegateGetModel action = null, DelegateGetList page = null, Label lbGuid = null)
+ public static void SetTabParameter(GridView gridView1, DevExpress.XtraTab.XtraTabControl xtraTabControl1, UcPageBar pageBar1, DelegateGetModel action = null, DelegateGetList page = null, Label lbGuid = null, UcToolBarMenu barMenu = null, DelegateGetUserControlList ucLst = null)
{
xtraTabControl1.SelectedPageChanged += (s, e) =>
{
+ if (pageBar1 != null && xtraTabControl1.SelectedTabPageIndex == 0)
+ {
+ if (barMenu != null)
+ barMenu.SetAllButton(0);
+
+ page(pageBar1.CurrentPage);
+ int rowHandle = 0;
+ rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], lbGuid.Text);
+ if (rowHandle < 0)
+ rowHandle = 0;
+ gridView1.FocusedRowHandle = rowHandle;
+ return;
+ }
+
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
int _handle = gridView1.FocusedRowHandle;
@@ -2033,15 +2048,14 @@
return;
}
action(_guid);
+ return;
}
- if (pageBar1 != null && xtraTabControl1.SelectedTabPageIndex == 0)
+
+ if (barMenu != null && xtraTabControl1.SelectedTabPageIndex == 2)
{
- page(pageBar1.CurrentPage);
- int rowHandle = 0;
- rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], lbGuid.Text);
- if (rowHandle < 0)
- rowHandle = 0;
- gridView1.FocusedRowHandle = rowHandle;
+ barMenu.SetAllButton(2);
+ ucLst();
+ return;
}
};
}
diff --git a/DevApp/Gs.DevApp/UserControl/SelectDaa.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectDaa.Designer.cs
index f957bdc..8308b4e 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectDaa.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectDaa.Designer.cs
@@ -45,6 +45,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -75,7 +76,8 @@
this.gridColumn3,
this.gridColumn4,
this.gridColumn5,
- this.gv_Btn});
+ this.gv_Btn,
+ this.gridColumn6});
this.gridView1.GridControl = this.gcMain;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -169,7 +171,7 @@
this.gridColumn5.MinWidth = 50;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 7;
+ this.gridColumn5.VisibleIndex = 8;
this.gridColumn5.Width = 50;
//
// gv_Btn
@@ -180,7 +182,7 @@
this.gv_Btn.MinWidth = 25;
this.gv_Btn.Name = "gv_Btn";
this.gv_Btn.Visible = true;
- this.gv_Btn.VisibleIndex = 8;
+ this.gv_Btn.VisibleIndex = 9;
this.gv_Btn.Width = 50;
//
// repositoryItemButtonEdit1
@@ -193,6 +195,16 @@
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "宸ュ崟绫诲瀷";
+ this.gridColumn6.FieldName = "daa025";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 7;
+ this.gridColumn6.Width = 94;
//
// SelectDaa
//
@@ -227,5 +239,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectDaa.cs b/DevApp/Gs.DevApp/UserControl/SelectDaa.cs
index 12f0706..01b7a0f 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectDaa.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectDaa.cs
@@ -1,4 +1,5 @@
-锘縰sing Gs.DevApp.Entity;
+锘縰sing DevExpress.XtraCharts.GLGraphics.Platform;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
@@ -16,21 +17,28 @@
public partial class SelectDaa : DevExpress.XtraEditors.XtraForm
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
- public SelectDaa()
+ private string orgId = "";
+ public SelectDaa(string _orgId)
{
InitializeComponent();
+ orgId = _orgId;
getPageList(1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
}
-
+
/// <summary>
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(1, 999999, "a.daa001", "asc", ""," and 1=1" + _sbSqlWhere.ToString());
+ gcMain.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.erp_sczz =" + orgId);
+ _sbSqlWhere.Append(" and a.erp_sczz in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
+ var pgq = new PageQueryModel(1, 999999, "a.daa001", "asc", "", " and 1=1" + _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
@@ -44,12 +52,11 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
- gridView1.BestFitColumns();
Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
-
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.BestFitColumns();
}
else
{
@@ -61,7 +68,6 @@
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
@@ -80,6 +86,8 @@
list.Add(new
{
guid = mxGuid,
+ gdlx = dr["daa025"].ToString(),//宸ュ崟绫诲瀷
+ gdlxWlid = dr["daa002"].ToString(),//宸ュ崟绫诲瀷鐗╂枡id
});
UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
Close();
diff --git a/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.Designer.cs
new file mode 100644
index 0000000..072d28a
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.Designer.cs
@@ -0,0 +1,59 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+ partial class UcBtnPrintAll
+ {
+ /// <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 Component 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.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
+ this.SuspendLayout();
+ //
+ // simpleButton1
+ //
+ this.simpleButton1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.simpleButton1.Location = new System.Drawing.Point(0, 0);
+ this.simpleButton1.Name = "simpleButton1";
+ this.simpleButton1.Size = new System.Drawing.Size(150, 39);
+ this.simpleButton1.TabIndex = 0;
+ this.simpleButton1.Text = "鎵撳嵃鎵�鏈夋槑缁�";
+ this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
+ //
+ // UcBtnPrintAll
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.simpleButton1);
+ this.Name = "UcBtnPrintAll";
+ this.Size = new System.Drawing.Size(150, 39);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraEditors.SimpleButton simpleButton1;
+ }
+}
diff --git a/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.cs b/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.cs
new file mode 100644
index 0000000..a793d6d
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.cs
@@ -0,0 +1,139 @@
+锘縰sing DevExpress.Utils.DirectXPaint;
+using DevExpress.XtraEditors;
+using FastReport;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.UserControl
+{
+ public partial class UcBtnPrintAll : DevExpress.XtraEditors.XtraUserControl
+ {
+ public UcBtnPrintAll()
+ {
+ InitializeComponent();
+ }
+ /// <summary>
+ /// 鎵撳嵃
+ /// </summary>
+ public event EventHandler btnPrintClick;
+
+ public string rptType { get; set; }
+ public List<dynamic> mxList { get; set; }
+ private void simpleButton1_Click(object sender, EventArgs e)
+ {
+ if (btnPrintClick != null)
+ btnPrintClick(this, e);
+ else
+ return;
+
+ if (string.IsNullOrEmpty(rptType))
+ {
+ return;
+ }
+ if (mxList.Count<=0)
+ {
+ return;
+ }
+ int rowsCount = 0;
+ foreach (dynamic obj in mxList)
+ {
+ string guid = obj.guid.ToString();
+ string psnQty = obj.kdy.ToString();
+ if (string.IsNullOrEmpty(psnQty))
+ {
+ continue;
+ }
+ if (psnQty == "0")
+ {
+ continue;
+ }
+ string rptParameter = rptType + "{"
+ + guid//鍏宠仈涓婚敭
+ + "," + ""
+ + "," + 0//浣欐暟
+ + "," + 1//寮犳暟
+ + "," + psnQty//姣忓紶鏉＄爜鏁伴噺锛岀洰鍓嶇瓑浜庣敵璇烽噺
+ + "}";
+ var _obj = new
+ {
+ rptParameter = rptParameter,
+ guid = guid,
+ isDesign = 0
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "Report/GetRptData",
+ JsonConvert.SerializeObject(_obj));
+ var _job = JObject.Parse(strJson);
+ var rtnCode = _job["rtnCode"].ToString();
+ if (int.Parse(rtnCode) > 0)
+ {
+ //妯℃澘
+ var report = new FastReport.Report();
+
+ EnvironmentSettings eSet = new EnvironmentSettings();
+ eSet.ReportSettings.ShowProgress = false;
+ report = new FastReport.Report();
+
+ var buffer = (byte[])_job["rtnData"]["reportTemplateData"];
+ using (var Stream = new MemoryStream(buffer))
+ {
+ report.Load(Stream);
+ }
+ //涓昏〃
+ var array = new JArray();
+ foreach (var a in _job["rtnData"]["zb"]) array.Add(a);
+ var _zb = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ _zb.TableName = "zb";
+ //鏄庣粏琛�1
+ var array1 = new JArray();
+ foreach (var a in _job["rtnData"]["mx1"]) array1.Add(a);
+ var _mx1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+ _mx1.TableName = "mx1";
+ //鏄庣粏琛�2
+ var array2 = new JArray();
+ foreach (var a in _job["rtnData"]["mx2"]) array2.Add(a);
+ var _mx2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+ _mx2.TableName = "mx2";
+ //鍔犲埌鏁版嵁闆嗕腑
+ var ds = new DataSet();
+ ds.Tables.Add(_zb);
+ ds.Tables.Add(_mx1);
+ ds.Tables.Add(_mx2);
+ report.RegisterData(ds);
+ report.PrintSettings.ShowDialog = false;
+ report.Print();
+ report.PrintSettings.ShowDialog = false;
+ report.Dispose();
+ rowsCount++;
+ }
+ else
+ {
+
+ }
+ }
+ catch (Exception ex)
+ {
+
+ }
+ Thread.Sleep(50);
+ }
+ if (rowsCount > 0)
+ MsgHelper.ShowInformation("鎻愮ず锛氭搷浣滄垚鍔燂紝鍏辨墦鍗�" + rowsCount.ToString() + "寮狅紒");
+ else
+ MsgHelper.ShowError("鎻愮ず锛氭殏鏃犲彲鎵撳嵃鐗╂枡锛�");
+ }
+ }
+}
diff --git a/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.resx b/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcBtnPrintAll.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/UserControl/UcLookDepartment.cs b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
index 557c3d7..afa06cf 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
@@ -30,15 +30,19 @@
if (EditChanged != null) EditChanged(this, e);
}
- public void getSuppler(string orgId, string _dftVale = "")
+ public void getSuppler(string orgId, string _dftVale = "", string strWhere = "")
{
lookSearchSupplier.EditValue = null;
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
if (!string.IsNullOrEmpty(orgId))
_sbSqlWhere.Append(" and a.FSubsidiary ='" + orgId + "'");
- _sbSqlWhere.Append(" and a.FSubsidiary in");
+ _sbSqlWhere.Append(" and a.FSubsidiary in");
_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
-
+ if (!string.IsNullOrEmpty(strWhere))
+ {
+ _sbSqlWhere.Append(" and " + strWhere);
+ }
+ _sbSqlWhere.Append(" and a.Depextr4 = 'A'");
var pgq = new PageQueryModel(1, 999999, "a.FSubsidiary asc,a.departmentcode", "asc", "", " and 1=1" + _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 73bbc59..7162d45 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -82,6 +82,7 @@
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
+ this.btnWj = new DevExpress.XtraBars.BarLargeButtonItem();
((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
this.SuspendLayout();
//
@@ -143,7 +144,8 @@
this.btnBaoGao,
this.btnPingZhi,
this.btnFPingZhi,
- this.btnBDLingLiao});
+ this.btnBDLingLiao,
+ this.btnWj});
this.barManager1.MainMenu = this.bar2;
this.barManager1.MaxItemId = 79;
//
@@ -202,7 +204,8 @@
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem3),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem4),
new DevExpress.XtraBars.LinkPersistInfo(this.btnBaoGao),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnBDLingLiao)});
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnBDLingLiao),
+ new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnWj, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph)});
this.bar2.OptionsBar.DrawDragBorder = false;
this.bar2.OptionsBar.MultiLine = true;
this.bar2.OptionsBar.UseWholeRow = true;
@@ -644,6 +647,15 @@
this.btnBDLingLiao.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem5.ImageOptions.LargeImage")));
this.btnBDLingLiao.Name = "btnBDLingLiao";
//
+ // btnWj
+ //
+ this.btnWj.Caption = "瀹岀粨";
+ this.btnWj.Id = 79;
+ this.btnWj.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnWj.ImageOptions.Image")));
+ this.btnWj.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnWj.ImageOptions.LargeImage")));
+ this.btnWj.Name = "btnWj";
+ this.btnWj.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// barDockControlTop
//
this.barDockControlTop.CausesValidation = false;
@@ -749,5 +761,6 @@
private DevExpress.XtraBars.BarLargeButtonItem btnPingZhi;
private DevExpress.XtraBars.BarLargeButtonItem btnFPingZhi;
private DevExpress.XtraBars.BarLargeButtonItem btnBDLingLiao;
+ private DevExpress.XtraBars.BarLargeButtonItem btnWj;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 1d42be1..1602684 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -415,6 +415,11 @@
btnPingZhiClick(this, e);
}
+ private void BtnWj_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnWjClick != null) btnWjClick(this, e);
+ }
+
/// <summary>
/// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
/// </summary>
@@ -1063,6 +1068,11 @@
/// </summary>
public event EventHandler btnBDLingLiaoClick;
+ /// <summary>
+ /// 瀹岀粨
+ /// </summary>
+ public event EventHandler btnWjClick;
+
#endregion
#region 鍏叡灞炴��
@@ -1107,7 +1117,47 @@
public string defaultActions { get; set; }
#endregion
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="inType"></param>
+ public void SetAllButton(int inType)
+ {
+ var lstBtn = new List<string>();
+ if (inType == 0)
+ {
+ lstBtn.Add(btnSave.Name);
+ lstBtn.Add(btnEsc.Name);
+ foreach (BarItem item in barManager1.Items)
+ if (item is BarLargeButtonItem largeButtonItem)
+ {
+ if (!lstBtn.Contains(item.Name))
+ largeButtonItem.Enabled = true;
+ else
+ largeButtonItem.Enabled = false;
+ }
+ return;
+ }
+ if (inType == 2)
+ {
+ lstBtn.Add(btnHelp.Name);
+ lstBtn.Add(btnLoad.Name);
+ lstBtn.Add(btnQuery.Name);
+ lstBtn.Add(btnLayout.Name);
+ lstBtn.Add(btnFont.Name);
+ lstBtn.Add(btnAdd.Name);
+ foreach (BarItem item in barManager1.Items)
+ if (item is BarLargeButtonItem largeButtonItem)
+ {
+ if (lstBtn.Contains(item.Name))
+ largeButtonItem.Enabled = true;
+ else
+ largeButtonItem.Enabled = false;
+ }
+ return;
+ }
+ }
/// <summary>
/// 鏌ユ壘gridView
--
Gitblit v1.9.3