From 4dc2dbda4150c7c74a26435a75308789dc359b99 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 01 十一月 2025 17:06:41 +0800
Subject: [PATCH] 增加批量打印功能，增加组织分开维护
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 700 ++++++++------
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 40
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 549 +++++++-----
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 756 +++++++++-------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 39
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | 481 ++++++----
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 39
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.resx | 22
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 12
9 files changed, 1,555 insertions(+), 1,083 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 984785a..321bb4b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -219,6 +219,8 @@
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.ucBtnPrintAll1 = new Gs.DevApp.UserControl.UcBtnPrintAll();
+ this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -330,6 +332,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -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,250 +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 = 1;
- this.gv_qt015.Width = 50;
+ this.gv_qt015.Width = 62;
//
// gv_qt014
//
this.gv_qt014.AppearanceCell.Options.UseFont = true;
this.gv_qt014.Caption = "瀹岀粨鏍囪瘑 ";
this.gv_qt014.FieldName = "txtColor";
- this.gv_qt014.MaxWidth = 50;
- this.gv_qt014.MinWidth = 50;
+ 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.Visible = true;
this.gv_qt014.VisibleIndex = 0;
- this.gv_qt014.Width = 50;
+ 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 = 4;
- this.gv_qtck.Width = 180;
+ 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 = 14;
- this.gv_qt003.Width = 94;
+ 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 = 15;
- this.gv_qt019.Width = 94;
+ this.gv_qt019.Width = 117;
//
// gv_qt005
//
this.gv_qt005.AppearanceCell.Options.UseFont = true;
this.gv_qt005.Caption = "鐢宠浜�";
this.gv_qt005.FieldName = "cjPeople";
- this.gv_qt005.MinWidth = 25;
+ 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 = 6;
- this.gv_qt005.Width = 94;
+ 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 = 7;
- this.gv_qt001.Width = 200;
+ this.gv_qt001.Width = 250;
//
// gv_qt016
//
this.gv_qt016.AppearanceCell.Options.UseFont = true;
this.gv_qt016.Caption = "瀹℃牳浜� ";
this.gv_qt016.FieldName = "shPeople";
- this.gv_qt016.MinWidth = 25;
+ 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 = 11;
- this.gv_qt016.Width = 94;
+ 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 = 12;
- this.gv_qt002.Width = 180;
+ 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 = 13;
- this.gv_qt010.Width = 94;
+ 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 = 16;
- this.gridColumn13.Width = 94;
+ 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 = 17;
- this.gridColumn14.Width = 94;
+ 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 = 18;
- this.gridColumn21.Width = 94;
+ 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 = 8;
- this.gridColumn22.Width = 94;
+ 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 = 9;
- this.gridColumn23.Width = 94;
+ 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 = 10;
- this.gridColumn24.Width = 94;
+ 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 = 3;
- this.gridColumn26.Width = 94;
+ 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 = 2;
- this.gridColumn27.Width = 94;
+ this.gridColumn27.Width = 117;
//
// gridColumn28
//
this.gridColumn28.Caption = "鍏ュ簱绫诲瀷";
this.gridColumn28.FieldName = "qtlx";
- this.gridColumn28.MinWidth = 25;
+ this.gridColumn28.MinWidth = 31;
this.gridColumn28.Name = "gridColumn28";
this.gridColumn28.Visible = true;
this.gridColumn28.VisibleIndex = 5;
- this.gridColumn28.Width = 94;
+ 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
@@ -686,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
@@ -698,12 +710,13 @@
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);
@@ -736,47 +749,52 @@
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";
//
// 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;
//
@@ -784,28 +802,29 @@
//
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
//
- this.txt_qt016.Location = new System.Drawing.Point(770, 74);
+ this.txt_qt016.Location = new System.Drawing.Point(957, 90);
+ this.txt_qt016.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
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.Size = new System.Drawing.Size(283, 28);
this.txt_qt016.StyleController = this.layoutMx1;
this.txt_qt016.TabIndex = 267;
this.txt_qt016.Tag = "readonly";
@@ -813,44 +832,48 @@
// 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";
@@ -858,7 +881,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)});
@@ -866,112 +890,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
//
- this.txt_qt030.Location = new System.Drawing.Point(1098, 105);
+ this.txt_qt030.Location = new System.Drawing.Point(1367, 128);
+ this.txt_qt030.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt030.Name = "txt_qt030";
- this.txt_qt030.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt030.Size = new System.Drawing.Size(285, 28);
this.txt_qt030.StyleController = this.layoutMx1;
this.txt_qt030.TabIndex = 334;
this.txt_qt030.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
//
- this.txt_qt034.Location = new System.Drawing.Point(1098, 12);
+ this.txt_qt034.Location = new System.Drawing.Point(1367, 14);
+ this.txt_qt034.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_qt034.Name = "txt_qt034";
- this.txt_qt034.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt034.Size = new System.Drawing.Size(285, 28);
this.txt_qt034.StyleController = this.layoutMx1;
this.txt_qt034.TabIndex = 337;
this.txt_qt034.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";
@@ -979,7 +1014,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)});
@@ -991,7 +1027,7 @@
"4:鏃犳簮鍗曞澶栭��鏉愭枡",
"5:鐩樼泩"});
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;
//
@@ -1029,7 +1065,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
//
@@ -1040,7 +1076,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
//
@@ -1067,7 +1103,8 @@
this.layoutControlItem11,
this.layoutControlItem2,
this.layoutControlItem38,
- this.layoutControlItem3});
+ this.layoutControlItem3,
+ this.layoutControlItem39});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1102,7 +1139,7 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1332, 207);
+ this.Root.Size = new System.Drawing.Size(1666, 253);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1110,106 +1147,106 @@
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.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;
@@ -1217,43 +1254,43 @@
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_qt034;
- this.layoutControlItem19.Location = new System.Drawing.Point(984, 0);
+ 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;
@@ -1261,23 +1298,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);
@@ -1286,22 +1323,22 @@
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_qt016;
- this.layoutControlItem9.Location = new System.Drawing.Point(656, 62);
+ 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;
@@ -1309,41 +1346,42 @@
// 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);
//
// 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,
@@ -1352,8 +1390,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
@@ -1361,6 +1400,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
@@ -1373,8 +1413,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
@@ -1394,18 +1434,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";
@@ -1414,16 +1456,16 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 49);
+ 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, 33);
+ 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;
@@ -1432,7 +1474,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, 33);
+ this.radOut.Size = new System.Drawing.Size(406, 41);
this.radOut.StyleController = this.lay99;
this.radOut.TabIndex = 479;
//
@@ -1440,29 +1482,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, 86);
+ 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, 33);
+ 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;
//
@@ -1487,7 +1532,7 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(406, 42);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem33
@@ -1495,88 +1540,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, 33);
+ 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, 33);
+ 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, 49);
+ 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, 49);
+ 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, 49);
+ 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, 86);
+ 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;
//
@@ -1632,16 +1684,16 @@
rowDefinition8,
rowDefinition9,
rowDefinition10});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 131);
+ 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, 37);
+ 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;
@@ -1649,11 +1701,11 @@
// layoutControlItem22
//
this.layoutControlItem22.Control = this.layoutControl1;
- this.layoutControlItem22.Location = new System.Drawing.Point(680, 74);
+ 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, 37);
+ 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;
@@ -1663,50 +1715,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, 37);
+ 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, 37);
+ 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, 37);
+ 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, 37);
+ 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, 37);
+ 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, 37);
+ 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
//
@@ -1715,43 +1767,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, 37);
+ 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, 37);
+ 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, 37);
+ 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, 74);
+ 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, 37);
+ 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, 37);
+ 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, 37);
+ 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;
@@ -1759,15 +1811,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});
@@ -1790,6 +1844,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;
@@ -1802,24 +1857,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
//
@@ -1829,12 +1884,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
//
@@ -1856,6 +1911,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;
@@ -1865,91 +1921,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 = 50;
+ this.gridColumn9.MinWidth = 62;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 0;
- this.gridColumn9.Width = 68;
+ this.gridColumn9.Width = 85;
//
// gridColumn10
//
this.gridColumn10.Caption = "鐗╂枡鍚嶇О";
this.gridColumn10.FieldName = "itemName";
- this.gridColumn10.MinWidth = 50;
+ this.gridColumn10.MinWidth = 62;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 1;
- this.gridColumn10.Width = 82;
+ this.gridColumn10.Width = 102;
//
// gridColumn11
//
this.gridColumn11.Caption = "鐗╂枡鍨嬪彿";
this.gridColumn11.FieldName = "itemModel";
- this.gridColumn11.MinWidth = 50;
+ this.gridColumn11.MinWidth = 62;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 2;
- this.gridColumn11.Width = 82;
+ this.gridColumn11.Width = 102;
//
// gridColumn7
//
this.gridColumn7.Caption = "浣跨敤缁勭粐";
this.gridColumn7.FieldName = "fSubsidiary";
- this.gridColumn7.MinWidth = 50;
+ this.gridColumn7.MinWidth = 62;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 3;
- this.gridColumn7.Width = 100;
+ 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
//
@@ -1960,12 +2016,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
//
@@ -1976,70 +2032,70 @@
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.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.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.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.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.Width = 207;
//
// repositoryItemButtonEdit1
//
@@ -2061,12 +2117,12 @@
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
//
@@ -2081,9 +2137,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
//
@@ -2092,17 +2148,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});
@@ -2124,6 +2183,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;
@@ -2135,158 +2195,181 @@
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.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;
//
+ // ucBtnPrintAll1
+ //
+ this.ucBtnPrintAll1.Location = new System.Drawing.Point(834, 204);
+ this.ucBtnPrintAll1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ 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;
+ //
+ // 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;
+ //
// 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();
@@ -2400,6 +2483,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
this.ResumeLayout(false);
}
@@ -2562,5 +2646,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 ee8d98a..8bfd911 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -212,6 +212,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) =>
{
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_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index d63ae4e..6113977 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -40,16 +40,17 @@
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.RowDefinition rowDefinition7 = 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.RowDefinition rowDefinition8 = 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.XtraLayout.RowDefinition rowDefinition11 = 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();
@@ -90,6 +91,7 @@
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.lbGuid = new System.Windows.Forms.Label();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.txt_tbl023 = new Gs.DevApp.UserControl.UcLookOrg();
@@ -145,6 +147,7 @@
this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -289,6 +292,7 @@
((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -346,9 +350,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);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1426, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1782, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -356,10 +361,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);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1426, 624);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1782, 762);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -368,8 +374,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1424, 592);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1780, 724);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -378,6 +385,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);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -390,17 +398,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1424, 592);
+ this.split1.Size = new System.Drawing.Size(1780, 724);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1424, 541);
+ this.gcMain1.Size = new System.Drawing.Size(1780, 661);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -410,7 +420,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_tbl013,
this.gv_tbl020,
@@ -432,8 +442,9 @@
this.gridColumn21,
this.gridColumn24,
this.gridColumn25});
+ 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;
@@ -444,257 +455,258 @@
this.gv_tbl013.AppearanceCell.Options.UseFont = true;
this.gv_tbl013.Caption = "鍒跺崟瀹℃牳";
this.gv_tbl013.FieldName = "isChk";
- this.gv_tbl013.MaxWidth = 50;
- this.gv_tbl013.MinWidth = 50;
+ this.gv_tbl013.MaxWidth = 62;
+ this.gv_tbl013.MinWidth = 62;
this.gv_tbl013.Name = "gv_tbl013";
this.gv_tbl013.OptionsColumn.AllowEdit = false;
this.gv_tbl013.Tag = "query_a.tbl013";
this.gv_tbl013.Visible = true;
this.gv_tbl013.VisibleIndex = 1;
- this.gv_tbl013.Width = 50;
+ this.gv_tbl013.Width = 62;
//
// gv_tbl020
//
this.gv_tbl020.AppearanceCell.Options.UseFont = true;
this.gv_tbl020.Caption = "瀹岀粨鏍囪瘑 ";
this.gv_tbl020.FieldName = "txtColor";
- this.gv_tbl020.MaxWidth = 50;
- this.gv_tbl020.MinWidth = 50;
+ this.gv_tbl020.MaxWidth = 62;
+ this.gv_tbl020.MinWidth = 62;
this.gv_tbl020.Name = "gv_tbl020";
this.gv_tbl020.OptionsColumn.AllowEdit = false;
this.gv_tbl020.Tag = "query_a.tbl020";
this.gv_tbl020.Visible = true;
this.gv_tbl020.VisibleIndex = 0;
- this.gv_tbl020.Width = 50;
+ this.gv_tbl020.Width = 62;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐢熶骇缁勭粐";
this.gridColumn5.FieldName = "tlOrg";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "org.fnamber";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 4;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// gv_billNo
//
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鐢宠鍗曞彿 ";
this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 50;
+ this.gv_billNo.MinWidth = 62;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.bill_no";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 5;
- this.gv_billNo.Width = 94;
+ this.gv_billNo.Width = 117;
//
// gv_tbl003
//
this.gv_tbl003.AppearanceCell.Options.UseFont = true;
this.gv_tbl003.Caption = "浠诲姟鍗曞彿 ";
this.gv_tbl003.FieldName = "daa021";
- this.gv_tbl003.MinWidth = 50;
+ this.gv_tbl003.MinWidth = 62;
this.gv_tbl003.Name = "gv_tbl003";
this.gv_tbl003.OptionsColumn.AllowEdit = false;
this.gv_tbl003.Tag = "query_a.tbl003";
this.gv_tbl003.Visible = true;
this.gv_tbl003.VisibleIndex = 6;
- this.gv_tbl003.Width = 94;
+ this.gv_tbl003.Width = 117;
//
// gv_tbl002
//
this.gv_tbl002.AppearanceCell.Options.UseFont = true;
this.gv_tbl002.Caption = "鐢熶骇宸ュ崟 ";
this.gv_tbl002.FieldName = "daa001";
- this.gv_tbl002.MinWidth = 50;
+ this.gv_tbl002.MinWidth = 62;
this.gv_tbl002.Name = "gv_tbl002";
this.gv_tbl002.OptionsColumn.AllowEdit = false;
this.gv_tbl002.Tag = "query_a.tbl002";
this.gv_tbl002.Visible = true;
this.gv_tbl002.VisibleIndex = 7;
- this.gv_tbl002.Width = 94;
+ this.gv_tbl002.Width = 117;
//
// gv_tbl021
//
this.gv_tbl021.AppearanceCell.Options.UseFont = true;
this.gv_tbl021.Caption = "鐢熶骇杞﹂棿 ";
this.gv_tbl021.FieldName = "dptName";
- this.gv_tbl021.MinWidth = 50;
+ this.gv_tbl021.MinWidth = 62;
this.gv_tbl021.Name = "gv_tbl021";
this.gv_tbl021.OptionsColumn.AllowEdit = false;
this.gv_tbl021.Tag = "query_a.tbl021";
this.gv_tbl021.Visible = true;
this.gv_tbl021.VisibleIndex = 9;
- this.gv_tbl021.Width = 94;
+ this.gv_tbl021.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "浜у搧缂栫爜";
this.gridColumn6.FieldName = "daa029";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 10;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// gridColumn10
//
this.gridColumn10.Caption = "浜у搧鍚嶇О";
this.gridColumn10.FieldName = "daa003";
- this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.MinWidth = 31;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 11;
- this.gridColumn10.Width = 94;
+ this.gridColumn10.Width = 117;
//
// gv_tbl004
//
this.gv_tbl004.AppearanceCell.Options.UseFont = true;
this.gv_tbl004.Caption = "浜у搧鍨嬪彿 ";
this.gv_tbl004.FieldName = "daa004";
- this.gv_tbl004.MinWidth = 50;
+ this.gv_tbl004.MinWidth = 62;
this.gv_tbl004.Name = "gv_tbl004";
this.gv_tbl004.OptionsColumn.AllowEdit = false;
this.gv_tbl004.Tag = "query_a.tbl004";
this.gv_tbl004.Visible = true;
this.gv_tbl004.VisibleIndex = 12;
- this.gv_tbl004.Width = 94;
+ this.gv_tbl004.Width = 117;
//
// gv_tbl005
//
this.gv_tbl005.AppearanceCell.Options.UseFont = true;
this.gv_tbl005.Caption = "閫�鏂欑被鍨�";
this.gv_tbl005.FieldName = "tbl005";
- this.gv_tbl005.MinWidth = 50;
+ this.gv_tbl005.MinWidth = 62;
this.gv_tbl005.Name = "gv_tbl005";
this.gv_tbl005.OptionsColumn.AllowEdit = false;
this.gv_tbl005.Tag = "query_a.tbl005";
this.gv_tbl005.Visible = true;
this.gv_tbl005.VisibleIndex = 13;
- this.gv_tbl005.Width = 94;
+ this.gv_tbl005.Width = 117;
//
// gv_tbl009
//
this.gv_tbl009.AppearanceCell.Options.UseFont = true;
this.gv_tbl009.Caption = "鍒涘缓浜� ";
this.gv_tbl009.FieldName = "cjPeople";
- this.gv_tbl009.MinWidth = 50;
+ this.gv_tbl009.MinWidth = 62;
this.gv_tbl009.Name = "gv_tbl009";
this.gv_tbl009.OptionsColumn.AllowEdit = false;
this.gv_tbl009.Tag = "query_a.tbl009";
this.gv_tbl009.Visible = true;
this.gv_tbl009.VisibleIndex = 14;
- this.gv_tbl009.Width = 94;
+ this.gv_tbl009.Width = 117;
//
// gv_tbl010
//
this.gv_tbl010.AppearanceCell.Options.UseFont = true;
this.gv_tbl010.Caption = "鍒涘缓鏃堕棿 ";
this.gv_tbl010.FieldName = "tbl010";
- this.gv_tbl010.MinWidth = 50;
+ this.gv_tbl010.MinWidth = 62;
this.gv_tbl010.Name = "gv_tbl010";
this.gv_tbl010.OptionsColumn.AllowEdit = false;
this.gv_tbl010.Tag = "query_a.tbl010";
this.gv_tbl010.Visible = true;
this.gv_tbl010.VisibleIndex = 15;
- this.gv_tbl010.Width = 94;
+ this.gv_tbl010.Width = 117;
//
// gv_tbl011
//
this.gv_tbl011.AppearanceCell.Options.UseFont = true;
this.gv_tbl011.Caption = "瀹℃牳浜� ";
this.gv_tbl011.FieldName = "shPeople";
- this.gv_tbl011.MinWidth = 50;
+ this.gv_tbl011.MinWidth = 62;
this.gv_tbl011.Name = "gv_tbl011";
this.gv_tbl011.OptionsColumn.AllowEdit = false;
this.gv_tbl011.Tag = "query_a.tbl011";
this.gv_tbl011.Visible = true;
this.gv_tbl011.VisibleIndex = 16;
- this.gv_tbl011.Width = 94;
+ this.gv_tbl011.Width = 117;
//
// gv_tbl012
//
this.gv_tbl012.AppearanceCell.Options.UseFont = true;
this.gv_tbl012.Caption = "瀹℃牳鏃堕棿 ";
this.gv_tbl012.FieldName = "tbl012";
- this.gv_tbl012.MinWidth = 50;
+ this.gv_tbl012.MinWidth = 62;
this.gv_tbl012.Name = "gv_tbl012";
this.gv_tbl012.OptionsColumn.AllowEdit = false;
this.gv_tbl012.Tag = "query_a.tbl012";
this.gv_tbl012.Visible = true;
this.gv_tbl012.VisibleIndex = 17;
- this.gv_tbl012.Width = 94;
+ this.gv_tbl012.Width = 117;
//
// gridColumn11
//
this.gridColumn11.Caption = "涓婚敭GUID";
this.gridColumn11.FieldName = "guid";
- this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.MinWidth = 31;
this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Width = 94;
+ this.gridColumn11.Width = 117;
//
// gridColumn12
//
this.gridColumn12.Caption = "鎶曟枡鍗曞彿";
this.gridColumn12.FieldName = "daa014";
- this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.MinWidth = 31;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 18;
- this.gridColumn12.Width = 94;
+ this.gridColumn12.Width = 117;
//
// gridColumn21
//
this.gridColumn21.Caption = "閲囪喘鎵瑰噯";
this.gridColumn21.FieldName = "tbl024Chk";
- this.gridColumn21.MaxWidth = 50;
- this.gridColumn21.MinWidth = 50;
+ this.gridColumn21.MaxWidth = 62;
+ this.gridColumn21.MinWidth = 62;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 2;
- this.gridColumn21.Width = 50;
+ this.gridColumn21.Width = 62;
//
// gridColumn24
//
this.gridColumn24.Caption = "鍝佽川瀹℃牳";
this.gridColumn24.FieldName = "tbl027Chk";
- this.gridColumn24.MaxWidth = 50;
- this.gridColumn24.MinWidth = 50;
+ this.gridColumn24.MaxWidth = 62;
+ this.gridColumn24.MinWidth = 62;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 3;
- this.gridColumn24.Width = 50;
+ this.gridColumn24.Width = 62;
//
// gridColumn25
//
this.gridColumn25.Caption = "鐢熶骇绾垮埆";
this.gridColumn25.FieldName = "lineName";
- this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.MinWidth = 31;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 8;
- this.gridColumn25.Width = 94;
+ this.gridColumn25.Width = 117;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 541);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 661);
+ 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(1424, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1780, 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);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1424, 592);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1780, 724);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -702,6 +714,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);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -714,12 +727,13 @@
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(1424, 592);
- this.splitMx1.SplitterPosition = 205;
+ this.splitMx1.Size = new System.Drawing.Size(1780, 724);
+ this.splitMx1.SplitterPosition = 284;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.ucBtnPrintAll1);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.btnSelect);
this.layoutMx1.Controls.Add(this.txt_tbl023);
@@ -753,18 +767,30 @@
this.layoutControlItem17,
this.layoutControlItem14});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(55, 282, 812, 616);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1424, 205);
+ this.layoutMx1.Size = new System.Drawing.Size(1780, 284);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
+ // ucBtnPrintAll1
+ //
+ this.ucBtnPrintAll1.Location = new System.Drawing.Point(1332, 240);
+ this.ucBtnPrintAll1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.ucBtnPrintAll1.mxList = null;
+ this.ucBtnPrintAll1.Name = "ucBtnPrintAll1";
+ this.ucBtnPrintAll1.rptType = null;
+ this.ucBtnPrintAll1.Size = new System.Drawing.Size(436, 32);
+ this.ucBtnPrintAll1.TabIndex = 479;
+ //
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(825, 108);
+ this.lbGuid.Location = new System.Drawing.Point(1031, 132);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(268, 28);
+ this.lbGuid.Size = new System.Drawing.Size(335, 34);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
@@ -772,9 +798,10 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 167);
+ this.btnSelect.Location = new System.Drawing.Point(12, 202);
+ this.btnSelect.Margin = new System.Windows.Forms.Padding(4);
this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(96, 27);
+ this.btnSelect.Size = new System.Drawing.Size(121, 34);
this.btnSelect.StyleController = this.layoutMx1;
this.btnSelect.TabIndex = 457;
this.btnSelect.Text = "閫夊彇鐗╂枡";
@@ -782,15 +809,17 @@
// txt_tbl023
//
this.txt_tbl023.IsReadly = false;
- this.txt_tbl023.Location = new System.Drawing.Point(114, 43);
+ this.txt_tbl023.Location = new System.Drawing.Point(132, 50);
+ this.txt_tbl023.Margin = new System.Windows.Forms.Padding(5);
this.txt_tbl023.Name = "txt_tbl023";
- this.txt_tbl023.Size = new System.Drawing.Size(245, 24);
+ this.txt_tbl023.Size = new System.Drawing.Size(316, 28);
this.txt_tbl023.TabIndex = 462;
//
// txt_tbl005
//
this.txt_tbl005.EditValue = "-璇烽�夋嫨-";
- this.txt_tbl005.Location = new System.Drawing.Point(114, 105);
+ this.txt_tbl005.Location = new System.Drawing.Point(132, 126);
+ this.txt_tbl005.Margin = new System.Windows.Forms.Padding(4);
this.txt_tbl005.Name = "txt_tbl005";
this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -800,16 +829,17 @@
"鏉ユ枡涓嶈壇閫�鏂�",
"浣滀笟涓嶈壇閫�鏂�"});
this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_tbl005.Size = new System.Drawing.Size(245, 24);
+ this.txt_tbl005.Size = new System.Drawing.Size(316, 28);
this.txt_tbl005.StyleController = this.layoutMx1;
this.txt_tbl005.TabIndex = 459;
//
// txt_tbl006
//
- this.txt_tbl006.Location = new System.Drawing.Point(114, 136);
+ this.txt_tbl006.Location = new System.Drawing.Point(132, 164);
+ this.txt_tbl006.Margin = new System.Windows.Forms.Padding(4);
this.txt_tbl006.Name = "txt_tbl006";
this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl006.Size = new System.Drawing.Size(245, 24);
+ this.txt_tbl006.Size = new System.Drawing.Size(316, 28);
this.txt_tbl006.StyleController = this.layoutMx1;
this.txt_tbl006.TabIndex = 226;
//
@@ -817,209 +847,231 @@
//
this.txt_tbl002.category = null;
this.txt_tbl002.IsReadly = false;
- this.txt_tbl002.Location = new System.Drawing.Point(114, 74);
+ this.txt_tbl002.Location = new System.Drawing.Point(132, 88);
+ this.txt_tbl002.Margin = new System.Windows.Forms.Padding(5);
this.txt_tbl002.Name = "txt_tbl002";
- this.txt_tbl002.Size = new System.Drawing.Size(245, 24);
+ this.txt_tbl002.Size = new System.Drawing.Size(316, 28);
this.txt_tbl002.TabIndex = 458;
//
// txt_workName
//
- this.txt_workName.Location = new System.Drawing.Point(465, 43);
+ this.txt_workName.Location = new System.Drawing.Point(572, 50);
+ this.txt_workName.Margin = new System.Windows.Forms.Padding(4);
this.txt_workName.Name = "txt_workName";
this.txt_workName.Properties.Appearance.Options.UseFont = true;
- this.txt_workName.Size = new System.Drawing.Size(245, 24);
+ this.txt_workName.Size = new System.Drawing.Size(316, 28);
this.txt_workName.StyleController = this.layoutMx1;
this.txt_workName.TabIndex = 298;
this.txt_workName.Tag = "readonly";
//
// txt_tbl012
//
- this.txt_tbl012.Location = new System.Drawing.Point(816, 136);
+ this.txt_tbl012.Location = new System.Drawing.Point(1012, 164);
+ this.txt_tbl012.Margin = new System.Windows.Forms.Padding(4);
this.txt_tbl012.Name = "txt_tbl012";
this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl012.Size = new System.Drawing.Size(245, 24);
+ this.txt_tbl012.Size = new System.Drawing.Size(316, 28);
this.txt_tbl012.StyleController = this.layoutMx1;
this.txt_tbl012.TabIndex = 247;
this.txt_tbl012.Tag = "readonly";
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(114, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(132, 12);
+ this.txt_billNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(245, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(316, 28);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
//
// txt_rwd
//
- this.txt_rwd.Location = new System.Drawing.Point(465, 12);
+ this.txt_rwd.Location = new System.Drawing.Point(572, 12);
+ this.txt_rwd.Margin = new System.Windows.Forms.Padding(4);
this.txt_rwd.Name = "txt_rwd";
this.txt_rwd.Properties.Appearance.Options.UseFont = true;
- this.txt_rwd.Size = new System.Drawing.Size(245, 24);
+ this.txt_rwd.Size = new System.Drawing.Size(316, 28);
this.txt_rwd.StyleController = this.layoutMx1;
this.txt_rwd.TabIndex = 217;
this.txt_rwd.Tag = "readonly";
//
// txt_tbl011
//
- this.txt_tbl011.Location = new System.Drawing.Point(816, 105);
+ this.txt_tbl011.Location = new System.Drawing.Point(1012, 126);
+ this.txt_tbl011.Margin = new System.Windows.Forms.Padding(4);
this.txt_tbl011.Name = "txt_tbl011";
this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl011.Size = new System.Drawing.Size(245, 24);
+ this.txt_tbl011.Size = new System.Drawing.Size(316, 28);
this.txt_tbl011.StyleController = this.layoutMx1;
this.txt_tbl011.TabIndex = 243;
this.txt_tbl011.Tag = "readonly";
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(465, 105);
+ this.txt_itemName.Location = new System.Drawing.Point(572, 126);
+ this.txt_itemName.Margin = new System.Windows.Forms.Padding(4);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(245, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(316, 28);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 219;
this.txt_itemName.Tag = "readonly";
//
// txt_tbl013
//
- this.txt_tbl013.Location = new System.Drawing.Point(714, 167);
+ this.txt_tbl013.Location = new System.Drawing.Point(892, 202);
+ this.txt_tbl013.Margin = new System.Windows.Forms.Padding(4);
this.txt_tbl013.Name = "txt_tbl013";
this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��";
this.txt_tbl013.RightToLeft = System.Windows.Forms.RightToLeft.No;
- this.txt_tbl013.Size = new System.Drawing.Size(347, 24);
+ this.txt_tbl013.Size = new System.Drawing.Size(436, 27);
this.txt_tbl013.StyleController = this.layoutMx1;
this.txt_tbl013.TabIndex = 463;
this.txt_tbl013.Tag = "readonly";
//
// txt_tbl009
//
- this.txt_tbl009.Location = new System.Drawing.Point(816, 12);
+ this.txt_tbl009.Location = new System.Drawing.Point(1012, 12);
+ this.txt_tbl009.Margin = new System.Windows.Forms.Padding(4);
this.txt_tbl009.Name = "txt_tbl009";
- this.txt_tbl009.Size = new System.Drawing.Size(245, 24);
+ this.txt_tbl009.Size = new System.Drawing.Size(316, 28);
this.txt_tbl009.StyleController = this.layoutMx1;
this.txt_tbl009.TabIndex = 464;
this.txt_tbl009.Tag = "readonly";
//
// txt_tbl010
//
- this.txt_tbl010.Location = new System.Drawing.Point(816, 43);
+ this.txt_tbl010.Location = new System.Drawing.Point(1012, 50);
+ this.txt_tbl010.Margin = new System.Windows.Forms.Padding(4);
this.txt_tbl010.Name = "txt_tbl010";
- this.txt_tbl010.Size = new System.Drawing.Size(245, 24);
+ this.txt_tbl010.Size = new System.Drawing.Size(316, 28);
this.txt_tbl010.StyleController = this.layoutMx1;
this.txt_tbl010.TabIndex = 465;
this.txt_tbl010.Tag = "readonly";
//
// txt_tbl020
//
- this.txt_tbl020.Location = new System.Drawing.Point(825, 105);
+ this.txt_tbl020.Location = new System.Drawing.Point(1031, 128);
+ this.txt_tbl020.Margin = new System.Windows.Forms.Padding(4);
this.txt_tbl020.Name = "txt_tbl020";
this.txt_tbl020.Properties.Caption = "瀹岀粨鏍囪瘑";
- this.txt_tbl020.Size = new System.Drawing.Size(268, 24);
+ this.txt_tbl020.Size = new System.Drawing.Size(335, 27);
this.txt_tbl020.StyleController = this.layoutMx1;
this.txt_tbl020.TabIndex = 466;
this.txt_tbl020.Tag = "readonly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(816, 74);
+ this.txt_itemNo.Location = new System.Drawing.Point(1012, 88);
+ this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Size = new System.Drawing.Size(245, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(316, 28);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 467;
this.txt_itemNo.Tag = "readonly";
//
// txt_id
//
- this.txt_id.Location = new System.Drawing.Point(632, 108);
+ this.txt_id.Location = new System.Drawing.Point(790, 132);
+ this.txt_id.Margin = new System.Windows.Forms.Padding(4);
this.txt_id.Name = "txt_id";
- this.txt_id.Size = new System.Drawing.Size(189, 24);
+ this.txt_id.Size = new System.Drawing.Size(236, 28);
this.txt_id.StyleController = this.layoutMx1;
this.txt_id.TabIndex = 468;
this.txt_id.Tag = "readonly";
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(465, 136);
+ this.txt_daa014.Location = new System.Drawing.Point(572, 164);
+ this.txt_daa014.Margin = new System.Windows.Forms.Padding(4);
this.txt_daa014.Name = "txt_daa014";
- this.txt_daa014.Size = new System.Drawing.Size(245, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(316, 28);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 469;
this.txt_daa014.Tag = "readonly";
//
// txt_tbl026
//
- this.txt_tbl026.Location = new System.Drawing.Point(1167, 105);
+ this.txt_tbl026.Location = new System.Drawing.Point(1452, 126);
+ this.txt_tbl026.Margin = new System.Windows.Forms.Padding(4);
this.txt_tbl026.Name = "txt_tbl026";
- this.txt_tbl026.Size = new System.Drawing.Size(245, 24);
+ this.txt_tbl026.Size = new System.Drawing.Size(316, 28);
this.txt_tbl026.StyleController = this.layoutMx1;
this.txt_tbl026.TabIndex = 470;
this.txt_tbl026.Tag = "readonly";
//
// txt_tbl025
//
- this.txt_tbl025.Location = new System.Drawing.Point(1167, 136);
+ this.txt_tbl025.Location = new System.Drawing.Point(1452, 164);
+ this.txt_tbl025.Margin = new System.Windows.Forms.Padding(4);
this.txt_tbl025.Name = "txt_tbl025";
- this.txt_tbl025.Size = new System.Drawing.Size(245, 24);
+ this.txt_tbl025.Size = new System.Drawing.Size(316, 28);
this.txt_tbl025.StyleController = this.layoutMx1;
this.txt_tbl025.TabIndex = 471;
this.txt_tbl025.Tag = "readonly";
//
// txt_chkOut
//
- this.txt_chkOut.Location = new System.Drawing.Point(363, 167);
+ this.txt_chkOut.Location = new System.Drawing.Point(452, 202);
+ this.txt_chkOut.Margin = new System.Windows.Forms.Padding(4);
this.txt_chkOut.Name = "txt_chkOut";
this.txt_chkOut.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_chkOut.Properties.Appearance.Options.UseForeColor = true;
this.txt_chkOut.Properties.Caption = "鏄惁鑷姩鐢熸垚琛ユ枡鍗�";
- this.txt_chkOut.Size = new System.Drawing.Size(347, 24);
+ this.txt_chkOut.Size = new System.Drawing.Size(436, 27);
this.txt_chkOut.StyleController = this.layoutMx1;
this.txt_chkOut.TabIndex = 472;
//
// txt_tbl024
//
- this.txt_tbl024.Location = new System.Drawing.Point(1065, 167);
+ this.txt_tbl024.Location = new System.Drawing.Point(1332, 202);
+ this.txt_tbl024.Margin = new System.Windows.Forms.Padding(4);
this.txt_tbl024.Name = "txt_tbl024";
this.txt_tbl024.Properties.Caption = "鎵瑰噯鐘舵��";
- this.txt_tbl024.Size = new System.Drawing.Size(347, 24);
+ this.txt_tbl024.Size = new System.Drawing.Size(436, 27);
this.txt_tbl024.StyleController = this.layoutMx1;
this.txt_tbl024.TabIndex = 473;
this.txt_tbl024.Tag = "readonly";
//
// txt_tbl028
//
- this.txt_tbl028.Location = new System.Drawing.Point(1167, 43);
+ this.txt_tbl028.Location = new System.Drawing.Point(1452, 50);
+ this.txt_tbl028.Margin = new System.Windows.Forms.Padding(4);
this.txt_tbl028.Name = "txt_tbl028";
- this.txt_tbl028.Size = new System.Drawing.Size(245, 24);
+ this.txt_tbl028.Size = new System.Drawing.Size(316, 28);
this.txt_tbl028.StyleController = this.layoutMx1;
this.txt_tbl028.TabIndex = 475;
this.txt_tbl028.Tag = "readonly";
//
// txt_tbl029
//
- this.txt_tbl029.Location = new System.Drawing.Point(1167, 12);
+ this.txt_tbl029.Location = new System.Drawing.Point(1452, 12);
+ this.txt_tbl029.Margin = new System.Windows.Forms.Padding(4);
this.txt_tbl029.Name = "txt_tbl029";
- this.txt_tbl029.Size = new System.Drawing.Size(245, 24);
+ this.txt_tbl029.Size = new System.Drawing.Size(316, 28);
this.txt_tbl029.StyleController = this.layoutMx1;
this.txt_tbl029.TabIndex = 476;
this.txt_tbl029.Tag = "readonly";
//
// txt_tbl027
//
- this.txt_tbl027.Location = new System.Drawing.Point(1065, 74);
+ this.txt_tbl027.Location = new System.Drawing.Point(1332, 88);
+ this.txt_tbl027.Margin = new System.Windows.Forms.Padding(4);
this.txt_tbl027.Name = "txt_tbl027";
this.txt_tbl027.Properties.Caption = "鍝佽川瀹℃牳鐘舵��";
- this.txt_tbl027.Size = new System.Drawing.Size(347, 24);
+ this.txt_tbl027.Size = new System.Drawing.Size(436, 27);
this.txt_tbl027.StyleController = this.layoutMx1;
this.txt_tbl027.TabIndex = 477;
this.txt_tbl027.Tag = "readonly";
//
// txt_line
//
- this.txt_line.Location = new System.Drawing.Point(465, 74);
+ this.txt_line.Location = new System.Drawing.Point(572, 88);
+ this.txt_line.Margin = new System.Windows.Forms.Padding(4);
this.txt_line.Name = "txt_line";
- this.txt_line.Size = new System.Drawing.Size(245, 24);
+ this.txt_line.Size = new System.Drawing.Size(316, 28);
this.txt_line.StyleController = this.layoutMx1;
this.txt_line.TabIndex = 478;
this.txt_line.Tag = "readonly";
@@ -1033,7 +1085,7 @@
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem7.Text = "涓婚敭GUID";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(66, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(82, 22);
//
// layoutControlItem17
//
@@ -1087,7 +1139,8 @@
this.layoutControlItem34,
this.lab_daa014,
this.layoutControlItem8,
- this.layoutControlItem39});
+ this.layoutControlItem39,
+ this.layoutControlItem40});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1115,138 +1168,141 @@
rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition6.Height = 100D;
rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 36D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.AutoSize;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
rowDefinition3,
rowDefinition4,
rowDefinition5,
- rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1424, 206);
+ rowDefinition6,
+ rowDefinition7});
+ this.Root.Size = new System.Drawing.Size(1780, 284);
this.Root.TextVisible = false;
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_tbl009;
- this.layoutControlItem12.Location = new System.Drawing.Point(702, 0);
+ this.layoutControlItem12.Location = new System.Drawing.Point(880, 0);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem12.Text = "鍒跺崟浜哄憳";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_tbl010;
- this.layoutControlItem13.Location = new System.Drawing.Point(702, 31);
+ this.layoutControlItem13.Location = new System.Drawing.Point(880, 38);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem13.Text = "鍒跺崟鏃堕棿";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_tbl005;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 93);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 114);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem5.Text = "閫�鏂欑被鍨�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_tbl002;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 76);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem4.Text = "鐢熶骇宸ュ崟";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_tbl023;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 38);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem3.Text = "鐢熶骇缁勭粐";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_itemNo;
- this.layoutControlItem18.Location = new System.Drawing.Point(702, 62);
+ this.layoutControlItem18.Location = new System.Drawing.Point(880, 76);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem18.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem18.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem18.Text = "浜у搧缂栧彿";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_workName;
- this.layoutControlItem6.Location = new System.Drawing.Point(351, 31);
+ this.layoutControlItem6.Location = new System.Drawing.Point(440, 38);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem6.Text = "鐢熶骇杞﹂棿";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_rwd;
- this.layoutControlItem2.Location = new System.Drawing.Point(351, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(440, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem2.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_tbl011;
- this.layoutControlItem9.Location = new System.Drawing.Point(702, 93);
+ this.layoutControlItem9.Location = new System.Drawing.Point(880, 114);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem9.Text = "鍒跺崟瀹℃牳浜哄憳";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_tbl012;
- this.layoutControlItem10.Location = new System.Drawing.Point(702, 124);
+ this.layoutControlItem10.Location = new System.Drawing.Point(880, 152);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem10.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem10.Text = "鍒跺崟瀹℃牳鏃堕棿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_tbl013;
- this.layoutControlItem11.Location = new System.Drawing.Point(702, 155);
+ this.layoutControlItem11.Location = new System.Drawing.Point(880, 190);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem11.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem11.Text = "瀹℃牳鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -1254,12 +1310,12 @@
// layoutControlItem16
//
this.layoutControlItem16.Control = this.btnSelect;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 155);
- this.layoutControlItem16.MaxSize = new System.Drawing.Size(100, 31);
- this.layoutControlItem16.MinSize = new System.Drawing.Size(30, 31);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 190);
+ this.layoutControlItem16.MaxSize = new System.Drawing.Size(125, 38);
+ this.layoutControlItem16.MinSize = new System.Drawing.Size(37, 38);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem16.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem16.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "閫夊彇鐗╂枡";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -1268,129 +1324,141 @@
// layoutControlItem36
//
this.layoutControlItem36.Control = this.txt_tbl029;
- this.layoutControlItem36.Location = new System.Drawing.Point(1053, 0);
+ this.layoutControlItem36.Location = new System.Drawing.Point(1320, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem36.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem36.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem36.Text = "鍝佽川瀹℃牳浜哄憳";
- this.layoutControlItem36.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem36.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem37
//
this.layoutControlItem37.Control = this.txt_tbl028;
- this.layoutControlItem37.Location = new System.Drawing.Point(1053, 31);
+ this.layoutControlItem37.Location = new System.Drawing.Point(1320, 38);
this.layoutControlItem37.Name = "layoutControlItem37";
this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem37.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem37.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem37.Text = "鍝佽川瀹℃牳鏃堕棿";
- this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem37.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.txt_tbl027;
- this.layoutControlItem38.Location = new System.Drawing.Point(1053, 62);
+ this.layoutControlItem38.Location = new System.Drawing.Point(1320, 76);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem38.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem38.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem38.TextVisible = false;
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.txt_tbl024;
- this.layoutControlItem35.Location = new System.Drawing.Point(1053, 155);
+ this.layoutControlItem35.Location = new System.Drawing.Point(1320, 190);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem35.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem35.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem35.TextVisible = false;
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_tbl025;
- this.layoutControlItem20.Location = new System.Drawing.Point(1053, 124);
+ this.layoutControlItem20.Location = new System.Drawing.Point(1320, 152);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem20.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem20.Text = "鎵瑰噯鏃堕棿";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_tbl026;
- this.layoutControlItem19.Location = new System.Drawing.Point(1053, 93);
+ this.layoutControlItem19.Location = new System.Drawing.Point(1320, 114);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem19.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem19.Text = "鎵瑰噯浜哄憳";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_tbl006;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 152);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem15.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem15.Text = "澶囨敞璇存槑";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_chkOut;
- this.layoutControlItem34.Location = new System.Drawing.Point(351, 155);
+ this.layoutControlItem34.Location = new System.Drawing.Point(440, 190);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem34.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem34.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem34.TextVisible = false;
//
// lab_daa014
//
this.lab_daa014.Control = this.txt_daa014;
- this.lab_daa014.Location = new System.Drawing.Point(351, 124);
+ this.lab_daa014.Location = new System.Drawing.Point(440, 152);
this.lab_daa014.Name = "lab_daa014";
this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 1;
this.lab_daa014.OptionsTableLayoutItem.RowIndex = 4;
- this.lab_daa014.Size = new System.Drawing.Size(351, 31);
+ this.lab_daa014.Size = new System.Drawing.Size(440, 38);
this.lab_daa014.Text = "鎶曟枡鍗曞彿";
- this.lab_daa014.TextSize = new System.Drawing.Size(90, 18);
+ this.lab_daa014.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_itemName;
- this.layoutControlItem8.Location = new System.Drawing.Point(351, 93);
+ this.layoutControlItem8.Location = new System.Drawing.Point(440, 114);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem8.Text = "浜у搧鍚嶇О";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem39
//
this.layoutControlItem39.Control = this.txt_line;
- this.layoutControlItem39.Location = new System.Drawing.Point(351, 62);
+ this.layoutControlItem39.Location = new System.Drawing.Point(440, 76);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem39.Size = new System.Drawing.Size(351, 31);
+ this.layoutControlItem39.Size = new System.Drawing.Size(440, 38);
this.layoutControlItem39.Text = "鐢熶骇绾垮埆";
- this.layoutControlItem39.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem39.TextSize = new System.Drawing.Size(108, 22);
+ //
+ // layoutControlItem40
+ //
+ this.layoutControlItem40.Control = this.ucBtnPrintAll1;
+ this.layoutControlItem40.Location = new System.Drawing.Point(1320, 228);
+ this.layoutControlItem40.Name = "layoutControlItem40";
+ this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem40.Size = new System.Drawing.Size(440, 36);
+ this.layoutControlItem40.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem40.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);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1424, 375);
+ this.tabMx.Size = new System.Drawing.Size(1780, 425);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1399,8 +1467,9 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.split99);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1422, 343);
+ this.tabMxPage1.Size = new System.Drawing.Size(1778, 387);
this.tabMxPage1.Text = "閫�鏂欐槑缁�";
//
// split99
@@ -1408,6 +1477,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);
this.split99.Name = "split99";
//
// split99.Panel1
@@ -1420,8 +1490,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(1422, 343);
- this.split99.SplitterPosition = 138;
+ this.split99.Size = new System.Drawing.Size(1778, 387);
+ this.split99.SplitterPosition = 169;
this.split99.TabIndex = 1;
//
// lay99
@@ -1441,18 +1511,20 @@
this.lay99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem33});
this.lay99.Location = new System.Drawing.Point(0, 0);
+ this.lay99.Margin = new System.Windows.Forms.Padding(4);
this.lay99.Name = "lay99";
this.lay99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(306, 272, 812, 500);
this.lay99.Root = this.layoutControlGroup1;
- this.lay99.Size = new System.Drawing.Size(1422, 138);
+ this.lay99.Size = new System.Drawing.Size(1778, 169);
this.lay99.TabIndex = 0;
this.lay99.Text = "layoutControl1";
//
// lbMxGuid
//
- this.lbMxGuid.Location = new System.Drawing.Point(1032, 84);
+ this.lbMxGuid.Location = new System.Drawing.Point(1290, 103);
+ this.lbMxGuid.Margin = new System.Windows.Forms.Padding(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 = 479;
this.lbMxGuid.Text = "lbMxGuid";
@@ -1461,16 +1533,16 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1062, 51);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1329, 61);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(348, 35);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(437, 46);
this.ucBtnPrint1.TabIndex = 478;
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(1062, 12);
+ this.radOut.Location = new System.Drawing.Point(1329, 12);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1479,7 +1551,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(348, 35);
+ this.radOut.Size = new System.Drawing.Size(437, 45);
this.radOut.StyleController = this.lay99;
this.radOut.TabIndex = 477;
//
@@ -1487,30 +1559,33 @@
//
this.dataLayoutControl1.Controls.Add(this.txt_iCount_1);
this.dataLayoutControl1.Controls.Add(this.txt_yuliang_1);
- this.dataLayoutControl1.Location = new System.Drawing.Point(712, 90);
+ this.dataLayoutControl1.Location = new System.Drawing.Point(890, 111);
+ this.dataLayoutControl1.Margin = new System.Windows.Forms.Padding(4);
this.dataLayoutControl1.Name = "dataLayoutControl1";
this.dataLayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 186, 812, 500);
this.dataLayoutControl1.Root = this.layoutControlGroup2;
- this.dataLayoutControl1.Size = new System.Drawing.Size(346, 36);
+ this.dataLayoutControl1.Size = new System.Drawing.Size(435, 46);
this.dataLayoutControl1.TabIndex = 227;
this.dataLayoutControl1.Text = "dataLayoutControl1";
//
// txt_iCount_1
//
- this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
+ this.txt_iCount_1.Location = new System.Drawing.Point(122, 2);
+ this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(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(67, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(93, 28);
this.txt_iCount_1.StyleController = this.dataLayoutControl1;
this.txt_iCount_1.TabIndex = 228;
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(277, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(339, 2);
+ this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(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(67, 24);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(94, 28);
this.txt_yuliang_1.StyleController = this.dataLayoutControl1;
this.txt_yuliang_1.TabIndex = 229;
//
@@ -1530,12 +1605,12 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition5,
columnDefinition6});
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition7});
+ rowDefinition8});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(346, 36);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(435, 46);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem30
@@ -1543,12 +1618,12 @@
this.layoutControlItem30.Control = this.txt_yuliang_1;
this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem30.CustomizationFormText = "鎵撳嵃浣欐暟";
- this.layoutControlItem30.Location = new System.Drawing.Point(173, 0);
+ this.layoutControlItem30.Location = new System.Drawing.Point(217, 0);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem30.Size = new System.Drawing.Size(173, 36);
+ this.layoutControlItem30.Size = new System.Drawing.Size(218, 46);
this.layoutControlItem30.Text = "鎵撳嵃浣欐暟";
- this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem29
//
@@ -1557,78 +1632,85 @@
this.layoutControlItem29.CustomizationFormText = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem29.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem29.Name = "layoutControlItem29";
- this.layoutControlItem29.Size = new System.Drawing.Size(173, 36);
+ this.layoutControlItem29.Size = new System.Drawing.Size(217, 46);
this.layoutControlItem29.Text = "鎵撳嵃鏁村紶鏁板��";
- this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(108, 22);
//
// txtWlid
//
- this.txtWlid.Location = new System.Drawing.Point(114, 12);
+ this.txtWlid.Location = new System.Drawing.Point(132, 12);
+ this.txtWlid.Margin = new System.Windows.Forms.Padding(4);
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(244, 24);
+ this.txtWlid.Size = new System.Drawing.Size(315, 28);
this.txtWlid.StyleController = this.lay99;
this.txtWlid.TabIndex = 214;
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(464, 12);
+ this.txtQuantity.Location = new System.Drawing.Point(571, 12);
+ this.txtQuantity.Margin = new System.Windows.Forms.Padding(4);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(244, 24);
+ this.txtQuantity.Size = new System.Drawing.Size(315, 28);
this.txtQuantity.StyleController = this.lay99;
this.txtQuantity.TabIndex = 220;
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(814, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(1010, 12);
+ this.txt_kQty.Margin = new System.Windows.Forms.Padding(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(244, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(315, 28);
this.txt_kQty.StyleController = this.lay99;
this.txt_kQty.TabIndex = 224;
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 51);
+ this.txtWlmc.Location = new System.Drawing.Point(132, 61);
+ this.txtWlmc.Margin = new System.Windows.Forms.Padding(4);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(244, 24);
+ this.txtWlmc.Size = new System.Drawing.Size(315, 28);
this.txtWlmc.StyleController = this.lay99;
this.txtWlmc.TabIndex = 216;
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(464, 51);
+ this.txt_yQty.Location = new System.Drawing.Point(571, 61);
+ this.txt_yQty.Margin = new System.Windows.Forms.Padding(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(244, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(315, 28);
this.txt_yQty.StyleController = this.lay99;
this.txt_yQty.TabIndex = 222;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(814, 51);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(1010, 61);
+ this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(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(244, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(315, 28);
this.txt_psnQty_1.StyleController = this.lay99;
this.txt_psnQty_1.TabIndex = 226;
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 90);
+ this.txtWlgg.Location = new System.Drawing.Point(132, 111);
+ this.txtWlgg.Margin = new System.Windows.Forms.Padding(4);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(594, 24);
+ this.txtWlgg.Size = new System.Drawing.Size(754, 28);
this.txtWlgg.StyleController = this.lay99;
this.txtWlgg.TabIndex = 218;
//
@@ -1674,17 +1756,17 @@
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;
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition8,
rowDefinition9,
- rowDefinition10});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1422, 138);
+ rowDefinition10,
+ rowDefinition11});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1778, 169);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem22
@@ -1692,84 +1774,84 @@
this.layoutControlItem22.Control = this.txtQuantity;
this.layoutControlItem22.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem22.CustomizationFormText = "鏈鐢宠鎬婚噺";
- this.layoutControlItem22.Location = new System.Drawing.Point(350, 0);
+ this.layoutControlItem22.Location = new System.Drawing.Point(439, 0);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(350, 39);
+ this.layoutControlItem22.Size = new System.Drawing.Size(439, 49);
this.layoutControlItem22.Text = "鏈鐢宠鎬婚噺";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_kQty;
this.layoutControlItem23.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem23.CustomizationFormText = "鍙墦鍗版�绘暟";
- this.layoutControlItem23.Location = new System.Drawing.Point(700, 0);
+ this.layoutControlItem23.Location = new System.Drawing.Point(878, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem23.Size = new System.Drawing.Size(350, 39);
+ this.layoutControlItem23.Size = new System.Drawing.Size(439, 49);
this.layoutControlItem23.Text = "鍙墦鍗版�绘暟";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txtWlgg;
this.layoutControlItem27.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem27.CustomizationFormText = "鐗╂枡瑙勬牸";
- this.layoutControlItem27.Location = new System.Drawing.Point(0, 78);
+ this.layoutControlItem27.Location = new System.Drawing.Point(0, 99);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(700, 40);
+ this.layoutControlItem27.Size = new System.Drawing.Size(878, 50);
this.layoutControlItem27.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txtWlmc;
this.layoutControlItem24.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem24.CustomizationFormText = "鐗╂枡鍚嶇О";
- this.layoutControlItem24.Location = new System.Drawing.Point(0, 39);
+ this.layoutControlItem24.Location = new System.Drawing.Point(0, 49);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem24.Size = new System.Drawing.Size(350, 39);
+ this.layoutControlItem24.Size = new System.Drawing.Size(439, 50);
this.layoutControlItem24.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_yQty;
this.layoutControlItem25.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem25.CustomizationFormText = "宸叉墦鍗版�婚噺";
- this.layoutControlItem25.Location = new System.Drawing.Point(350, 39);
+ this.layoutControlItem25.Location = new System.Drawing.Point(439, 49);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem25.Size = new System.Drawing.Size(350, 39);
+ this.layoutControlItem25.Size = new System.Drawing.Size(439, 50);
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_psnQty_1;
this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem26.CustomizationFormText = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem26.Location = new System.Drawing.Point(700, 39);
+ this.layoutControlItem26.Location = new System.Drawing.Point(878, 49);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem26.Size = new System.Drawing.Size(350, 39);
+ this.layoutControlItem26.Size = new System.Drawing.Size(439, 50);
this.layoutControlItem26.Text = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.dataLayoutControl1;
- this.layoutControlItem28.Location = new System.Drawing.Point(700, 78);
+ this.layoutControlItem28.Location = new System.Drawing.Point(878, 99);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem28.Size = new System.Drawing.Size(350, 40);
+ this.layoutControlItem28.Size = new System.Drawing.Size(439, 50);
this.layoutControlItem28.Text = "鎵撳嵃寮犳暟";
this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem28.TextVisible = false;
@@ -1777,10 +1859,10 @@
// layoutControlItem31
//
this.layoutControlItem31.Control = this.radOut;
- this.layoutControlItem31.Location = new System.Drawing.Point(1050, 0);
+ this.layoutControlItem31.Location = new System.Drawing.Point(1317, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem31.Size = new System.Drawing.Size(352, 39);
+ this.layoutControlItem31.Size = new System.Drawing.Size(441, 49);
this.layoutControlItem31.Text = "鑷姩璁＄畻";
this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem31.TextVisible = false;
@@ -1792,18 +1874,18 @@
this.layoutControlItem21.CustomizationFormText = "鐗╂枡缂栫爜";
this.layoutControlItem21.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.Size = new System.Drawing.Size(350, 39);
+ this.layoutControlItem21.Size = new System.Drawing.Size(439, 49);
this.layoutControlItem21.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.ucBtnPrint1;
- this.layoutControlItem32.Location = new System.Drawing.Point(1050, 39);
+ this.layoutControlItem32.Location = new System.Drawing.Point(1317, 49);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem32.Size = new System.Drawing.Size(352, 39);
+ this.layoutControlItem32.Size = new System.Drawing.Size(441, 50);
this.layoutControlItem32.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem32.TextVisible = false;
@@ -1811,13 +1893,15 @@
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.rptBl});
- this.gcMx1.Size = new System.Drawing.Size(1422, 193);
+ this.gcMx1.Size = new System.Drawing.Size(1778, 203);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1846,6 +1930,7 @@
this.gridColumn22,
this.gridColumn23,
this.gridColumn26});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1857,66 +1942,66 @@
this.gvMx1tlid.AppearanceCell.Options.UseFont = true;
this.gvMx1tlid.Caption = "鐢宠鏄庣粏琛ㄤ富閿�";
this.gvMx1tlid.FieldName = "tlid";
- this.gvMx1tlid.MinWidth = 50;
+ this.gvMx1tlid.MinWidth = 62;
this.gvMx1tlid.Name = "gvMx1tlid";
this.gvMx1tlid.Tag = "query_a.tlid";
- this.gvMx1tlid.Width = 94;
+ this.gvMx1tlid.Width = 117;
//
// gridColumn3
//
this.gridColumn3.Caption = "dabGuid";
this.gridColumn3.FieldName = "aboutGuid";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gvMx1tld001
//
this.gvMx1tld001.AppearanceCell.Options.UseFont = true;
this.gvMx1tld001.Caption = "宸ュ崟鍙�";
this.gvMx1tld001.FieldName = "tld001";
- this.gvMx1tld001.MinWidth = 50;
+ this.gvMx1tld001.MinWidth = 62;
this.gvMx1tld001.Name = "gvMx1tld001";
this.gvMx1tld001.Tag = "query_a.tld001";
this.gvMx1tld001.Visible = true;
this.gvMx1tld001.VisibleIndex = 0;
- this.gvMx1tld001.Width = 78;
+ this.gvMx1tld001.Width = 97;
//
// gvMx1tld002
//
this.gvMx1tld002.AppearanceCell.Options.UseFont = true;
this.gvMx1tld002.Caption = "鐗╂枡缂栫爜";
this.gvMx1tld002.FieldName = "tld002";
- this.gvMx1tld002.MinWidth = 50;
+ this.gvMx1tld002.MinWidth = 62;
this.gvMx1tld002.Name = "gvMx1tld002";
this.gvMx1tld002.Tag = "query_a.tld002";
this.gvMx1tld002.Visible = true;
this.gvMx1tld002.VisibleIndex = 1;
- this.gvMx1tld002.Width = 78;
+ this.gvMx1tld002.Width = 97;
//
// gvMx1tld003
//
this.gvMx1tld003.AppearanceCell.Options.UseFont = true;
this.gvMx1tld003.Caption = "鐗╂枡鍚嶇О";
this.gvMx1tld003.FieldName = "tld003";
- this.gvMx1tld003.MinWidth = 50;
+ this.gvMx1tld003.MinWidth = 62;
this.gvMx1tld003.Name = "gvMx1tld003";
this.gvMx1tld003.Tag = "query_a.tld003";
this.gvMx1tld003.Visible = true;
this.gvMx1tld003.VisibleIndex = 2;
- this.gvMx1tld003.Width = 78;
+ this.gvMx1tld003.Width = 97;
//
// gvMx1tld004
//
this.gvMx1tld004.AppearanceCell.Options.UseFont = true;
this.gvMx1tld004.Caption = "瑙勬牸鍨嬪彿";
this.gvMx1tld004.FieldName = "tld004";
- this.gvMx1tld004.MinWidth = 50;
+ this.gvMx1tld004.MinWidth = 62;
this.gvMx1tld004.Name = "gvMx1tld004";
this.gvMx1tld004.Tag = "query_a.tld004";
this.gvMx1tld004.Visible = true;
this.gvMx1tld004.VisibleIndex = 12;
- this.gvMx1tld004.Width = 78;
+ this.gvMx1tld004.Width = 97;
//
// gvMx1tld005
//
@@ -1927,86 +2012,86 @@
this.gvMx1tld005.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1tld005.Caption = "鐢宠鏁伴噺";
this.gvMx1tld005.FieldName = "tld005";
- this.gvMx1tld005.MinWidth = 50;
+ this.gvMx1tld005.MinWidth = 62;
this.gvMx1tld005.Name = "gvMx1tld005";
this.gvMx1tld005.Tag = "yz_quantity_0_edit";
this.gvMx1tld005.Visible = true;
this.gvMx1tld005.VisibleIndex = 3;
- this.gvMx1tld005.Width = 78;
+ this.gvMx1tld005.Width = 97;
//
// gridColumn13
//
this.gridColumn13.Caption = "宸查鏁伴噺";
this.gridColumn13.FieldName = "ylsl";
- this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.MinWidth = 31;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 7;
- this.gridColumn13.Width = 84;
+ this.gridColumn13.Width = 105;
//
// gvMx1tld006
//
this.gvMx1tld006.AppearanceCell.Options.UseFont = true;
this.gvMx1tld006.Caption = "宸查��鏁伴噺";
this.gvMx1tld006.FieldName = "ytsl";
- this.gvMx1tld006.MinWidth = 50;
+ this.gvMx1tld006.MinWidth = 62;
this.gvMx1tld006.Name = "gvMx1tld006";
this.gvMx1tld006.Tag = "query_a.tld006";
this.gvMx1tld006.Visible = true;
this.gvMx1tld006.VisibleIndex = 8;
- this.gvMx1tld006.Width = 84;
+ this.gvMx1tld006.Width = 105;
//
// gvMx1tld007
//
this.gvMx1tld007.AppearanceCell.Options.UseFont = true;
this.gvMx1tld007.Caption = "鍗曚綅";
this.gvMx1tld007.FieldName = "dwName";
- this.gvMx1tld007.MinWidth = 50;
+ this.gvMx1tld007.MinWidth = 62;
this.gvMx1tld007.Name = "gvMx1tld007";
this.gvMx1tld007.Tag = "query_a.tld007";
this.gvMx1tld007.Visible = true;
this.gvMx1tld007.VisibleIndex = 9;
- this.gvMx1tld007.Width = 84;
+ this.gvMx1tld007.Width = 105;
//
// gvMx1tld009
//
this.gvMx1tld009.AppearanceCell.Options.UseFont = true;
this.gvMx1tld009.Caption = "鐗╂枡id";
this.gvMx1tld009.FieldName = "tld009";
- this.gvMx1tld009.MinWidth = 50;
+ this.gvMx1tld009.MinWidth = 62;
this.gvMx1tld009.Name = "gvMx1tld009";
this.gvMx1tld009.Tag = "query_a.tld009";
- this.gvMx1tld009.Width = 94;
+ this.gvMx1tld009.Width = 117;
//
// gridColumn1
//
this.gridColumn1.Caption = "宸叉墦鍗版暟閲�";
this.gridColumn1.FieldName = "ydy";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 10;
- this.gridColumn1.Width = 84;
+ this.gridColumn1.Width = 105;
//
// gridColumn2
//
this.gridColumn2.Caption = "鍙墦鍗版暟閲�";
this.gridColumn2.FieldName = "kdy";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 11;
- this.gridColumn2.Width = 84;
+ this.gridColumn2.Width = 105;
//
// 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 = 13;
- this.gvMxDel.Width = 88;
+ this.gvMxDel.Width = 110;
//
// repositoryItemButtonEdit1
//
@@ -2027,12 +2112,12 @@
this.gridColumn18.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn18.Caption = "澶囨敞";
this.gridColumn18.FieldName = "tld014";
- this.gridColumn18.MinWidth = 80;
+ this.gridColumn18.MinWidth = 100;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Tag = "edit";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 4;
- this.gridColumn18.Width = 80;
+ this.gridColumn18.Width = 100;
//
// gridColumn19
//
@@ -2043,12 +2128,12 @@
this.gridColumn19.Caption = "閫夋嫨涓嶈壇绫诲埆";
this.gridColumn19.ColumnEdit = this.rptBl;
this.gridColumn19.FieldName = "tld015";
- this.gridColumn19.MinWidth = 100;
+ this.gridColumn19.MinWidth = 125;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Tag = "edit";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 5;
- this.gridColumn19.Width = 100;
+ this.gridColumn19.Width = 125;
//
// rptBl
//
@@ -2067,9 +2152,9 @@
this.gridColumn20.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn20.Caption = "绱鐢宠閲�";
this.gridColumn20.FieldName = "sqQty";
- this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.MinWidth = 31;
this.gridColumn20.Name = "gridColumn20";
- this.gridColumn20.Width = 94;
+ this.gridColumn20.Width = 117;
//
// gridColumn22
//
@@ -2079,9 +2164,9 @@
this.gridColumn22.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn22.Caption = "绱Н閫�閲�";
this.gridColumn22.FieldName = "tQty";
- this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.MinWidth = 31;
this.gridColumn22.Name = "gridColumn22";
- this.gridColumn22.Width = 94;
+ this.gridColumn22.Width = 117;
//
// gridColumn23
//
@@ -2091,9 +2176,9 @@
this.gridColumn23.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn23.Caption = "绱琛ラ噺";
this.gridColumn23.FieldName = "bQty";
- this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.MinWidth = 31;
this.gridColumn23.Name = "gridColumn23";
- this.gridColumn23.Width = 94;
+ this.gridColumn23.Width = 117;
//
// gridColumn26
//
@@ -2103,26 +2188,29 @@
this.gridColumn26.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn26.Caption = "Mes/Erp搴撳瓨";
this.gridColumn26.FieldName = "kcQty";
- this.gridColumn26.MinWidth = 25;
+ this.gridColumn26.MinWidth = 31;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 6;
- this.gridColumn26.Width = 94;
+ this.gridColumn26.Width = 117;
//
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
+ this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1422, 343);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1778, 420);
this.xtraTabPage3.Text = "宸叉墦鏉＄爜鏄庣粏";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Margin = new System.Windows.Forms.Padding(4);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1422, 343);
+ this.gcMx2.Size = new System.Drawing.Size(1778, 420);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2144,6 +2232,7 @@
this.gridColumn14,
this.gridColumn17,
this.gridColumn16});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -2155,145 +2244,146 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 50;
+ this.gvMx1guid.MinWidth = 62;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
+ this.gvMx1guid.Width = 117;
//
// gridColumn15
//
this.gridColumn15.Caption = "鏄惁鍏ュ簱";
this.gridColumn15.FieldName = "isRk";
- this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.MinWidth = 31;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 0;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.Width = 117;
//
// gvMx1itemBarcode
//
this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx1itemBarcode.FieldName = "itemBarcode";
- this.gvMx1itemBarcode.MinWidth = 300;
+ this.gvMx1itemBarcode.MinWidth = 375;
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
this.gvMx1itemBarcode.VisibleIndex = 1;
- 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 = 2;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 117;
//
// gridColumn9
//
this.gridColumn9.Caption = "鐗╂枡鍚嶇О";
this.gridColumn9.FieldName = "itemName";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 31;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 3;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 117;
//
// gridColumn8
//
this.gridColumn8.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn8.FieldName = "itemModel";
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 31;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 4;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.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 = 5;
- this.gvMx1quantity.Width = 94;
+ this.gvMx1quantity.Width = 117;
//
// gridColumn7
//
this.gridColumn7.Caption = "鍗曚綅";
this.gridColumn7.FieldName = "dwName";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 6;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 117;
//
// gvMx1createBy
//
this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
this.gvMx1createBy.Caption = "鍒涘缓浜�";
this.gvMx1createBy.FieldName = "createBy";
- this.gvMx1createBy.MinWidth = 50;
+ this.gvMx1createBy.MinWidth = 62;
this.gvMx1createBy.Name = "gvMx1createBy";
this.gvMx1createBy.Tag = "query_a.CREATE_BY";
this.gvMx1createBy.Visible = true;
this.gvMx1createBy.VisibleIndex = 7;
- 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 = 50;
+ this.gvMx1lotDate.MinWidth = 62;
this.gvMx1lotDate.Name = "gvMx1lotDate";
this.gvMx1lotDate.Tag = "query_a.LOT_DATE";
this.gvMx1lotDate.Visible = true;
this.gvMx1lotDate.VisibleIndex = 8;
- this.gvMx1lotDate.Width = 94;
+ this.gvMx1lotDate.Width = 117;
//
// gridColumn14
//
this.gridColumn14.Caption = "鍏ュ簱浜�";
this.gridColumn14.FieldName = "rkUser";
- this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.MinWidth = 31;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 9;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.Width = 117;
//
// gridColumn17
//
this.gridColumn17.Caption = "鍏ュ簱浣�";
this.gridColumn17.FieldName = "rkPositon";
- this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.MinWidth = 31;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 10;
- this.gridColumn17.Width = 94;
+ this.gridColumn17.Width = 117;
//
// gridColumn16
//
this.gridColumn16.Caption = "鍏ュ簱鏃ユ湡";
this.gridColumn16.FieldName = "rkDate";
- this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.MinWidth = 31;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 11;
- this.gridColumn16.Width = 94;
+ this.gridColumn16.Width = 117;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1016, 45);
+ this.picCheckBox.Location = new System.Drawing.Point(1270, 55);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(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;
@@ -2301,12 +2391,13 @@
//
// Frm_MesItemTbl
//
- 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(1426, 704);
+ this.ClientSize = new System.Drawing.Size(1782, 860);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Frm_MesItemTbl";
this.Text = "鐢熶骇閫�鏂欑敵璇�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -2379,6 +2470,7 @@
((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2588,5 +2680,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
+ private UserControl.UcBtnPrintAll ucBtnPrintAll1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index b5a0d0f..021e7e4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -176,6 +176,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_SCTL";
+ this.ucBtnPrintAll1.mxList = lst;
+ };
#endregion
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 3f6e495..bc17dc5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -167,6 +167,8 @@
this.xtraTabPageReport = new DevExpress.XtraTab.XtraTabPage();
this.ucRptCgdhdPrint1 = new Gs.DevApp.DevFrm.Rpt.UcRptCgdhdPrint();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.ucBtnPrintAll1 = new Gs.DevApp.UserControl.UcBtnPrintAll();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -252,6 +254,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
this.xtraTabPageReport.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -263,9 +266,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 = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1346, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1682, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -273,10 +277,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(1346, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1682, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -286,8 +291,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(1344, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1680, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -296,6 +302,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
@@ -308,17 +315,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1344, 570);
+ this.split1.Size = new System.Drawing.Size(1680, 698);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(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(1344, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1680, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -330,7 +339,7 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Appearance.ViewCaption.Options.UseTextOptions = true;
this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.ColumnPanelRowHeight = 61;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn13,
this.gv_urgentFlag,
@@ -348,8 +357,9 @@
this.gv_checkDate,
this.gridColumn3,
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;
@@ -359,206 +369,207 @@
//
this.gridColumn13.Caption = "鏀舵枡缁勭粐";
this.gridColumn13.FieldName = "receivingOrg";
- this.gridColumn13.MinWidth = 50;
+ this.gridColumn13.MinWidth = 62;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Tag = "org.fnamber";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 250;
+ this.gridColumn13.Width = 312;
//
// gv_urgentFlag
//
this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
this.gv_urgentFlag.Caption = "鎬ユ枡";
this.gv_urgentFlag.FieldName = "urgentFlagTxt";
- this.gv_urgentFlag.MaxWidth = 50;
- this.gv_urgentFlag.MinWidth = 50;
+ this.gv_urgentFlag.MaxWidth = 62;
+ this.gv_urgentFlag.MinWidth = 62;
this.gv_urgentFlag.Name = "gv_urgentFlag";
this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
this.gv_urgentFlag.Tag = "query_a.urgent_flag";
this.gv_urgentFlag.Visible = true;
this.gv_urgentFlag.VisibleIndex = 1;
- this.gv_urgentFlag.Width = 50;
+ this.gv_urgentFlag.Width = 62;
//
// gridColumn25
//
this.gridColumn25.Caption = "濮斿";
this.gridColumn25.FieldName = "fType";
- this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.MinWidth = 31;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 2;
- this.gridColumn25.Width = 94;
+ this.gridColumn25.Width = 117;
//
// gv_status
//
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "鍏ュ簱";
this.gv_status.FieldName = "statusChk";
- this.gv_status.MaxWidth = 50;
- this.gv_status.MinWidth = 50;
+ this.gv_status.MaxWidth = 62;
+ this.gv_status.MinWidth = 62;
this.gv_status.Name = "gv_status";
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.status";
this.gv_status.Visible = true;
this.gv_status.VisibleIndex = 3;
- this.gv_status.Width = 50;
+ this.gv_status.Width = 62;
//
// gv_billNo
//
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 50;
+ this.gv_billNo.MinWidth = 62;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.bill_no";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 4;
- this.gv_billNo.Width = 120;
+ this.gv_billNo.Width = 150;
//
// gridColumn1
//
this.gridColumn1.Caption = "鏉＄爜鎵撳嵃姣旂巼";
this.gridColumn1.FieldName = "barRatioTxtColor";
- this.gridColumn1.MaxWidth = 80;
- this.gridColumn1.MinWidth = 80;
+ this.gridColumn1.MaxWidth = 100;
+ this.gridColumn1.MinWidth = 100;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 5;
- this.gridColumn1.Width = 80;
+ this.gridColumn1.Width = 100;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 50;
+ this.gv_createBy.MinWidth = 62;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 6;
- this.gv_createBy.Width = 94;
+ this.gv_createBy.Width = 117;
//
// gridColumn26
//
this.gridColumn26.Caption = "鍒涘缓鏃ユ湡";
this.gridColumn26.FieldName = "createDate";
- this.gridColumn26.MinWidth = 25;
+ this.gridColumn26.MinWidth = 31;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 7;
- this.gridColumn26.Width = 94;
+ this.gridColumn26.Width = 117;
//
// gv_suppNo
//
this.gv_suppNo.AppearanceCell.Options.UseFont = true;
this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
this.gv_suppNo.FieldName = "suppNo";
- this.gv_suppNo.MinWidth = 50;
+ this.gv_suppNo.MinWidth = 62;
this.gv_suppNo.Name = "gv_suppNo";
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.supp_no";
this.gv_suppNo.Visible = true;
this.gv_suppNo.VisibleIndex = 8;
- this.gv_suppNo.Width = 94;
+ this.gv_suppNo.Width = 117;
//
// gridColumn2
//
this.gridColumn2.Caption = "渚涘簲鍟嗗悕绉�";
this.gridColumn2.FieldName = "suppName";
- this.gridColumn2.MinWidth = 50;
+ this.gridColumn2.MinWidth = 62;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 9;
- this.gridColumn2.Width = 200;
+ this.gridColumn2.Width = 250;
//
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞";
this.gv_remark.FieldName = "remark";
- this.gv_remark.MinWidth = 50;
+ this.gv_remark.MinWidth = 62;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
this.gv_remark.VisibleIndex = 10;
- this.gv_remark.Width = 94;
+ this.gv_remark.Width = 117;
//
// gv_fstatus
//
this.gv_fstatus.AppearanceCell.Options.UseFont = true;
this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
this.gv_fstatus.FieldName = "fstatus";
- this.gv_fstatus.MaxWidth = 50;
- this.gv_fstatus.MinWidth = 50;
+ this.gv_fstatus.MaxWidth = 62;
+ this.gv_fstatus.MinWidth = 62;
this.gv_fstatus.Name = "gv_fstatus";
this.gv_fstatus.OptionsColumn.AllowEdit = false;
this.gv_fstatus.Tag = "query_a.fstatus";
- this.gv_fstatus.Width = 50;
+ this.gv_fstatus.Width = 62;
//
// gridColumn11
//
this.gridColumn11.Caption = "瀹℃牳浜�";
this.gridColumn11.FieldName = "checkUser";
- this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.MinWidth = 31;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 11;
- this.gridColumn11.Width = 94;
+ this.gridColumn11.Width = 117;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 50;
+ this.gv_checkDate.MinWidth = 62;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
this.gv_checkDate.VisibleIndex = 12;
- this.gv_checkDate.Width = 180;
+ this.gv_checkDate.Width = 225;
//
// gridColumn3
//
this.gridColumn3.Caption = "鍒拌揣鍗旼uid";
this.gridColumn3.FieldName = "guid";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gridColumn28
//
this.gridColumn28.Caption = "Srm鍒拌揣鍗曞彿";
this.gridColumn28.FieldName = "paperBillNo";
- this.gridColumn28.MinWidth = 25;
+ this.gridColumn28.MinWidth = 31;
this.gridColumn28.Name = "gridColumn28";
this.gridColumn28.Visible = true;
this.gridColumn28.VisibleIndex = 13;
- this.gridColumn28.Width = 94;
+ 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(1344, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1680, 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(1344, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1680, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -566,6 +577,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
@@ -578,12 +590,13 @@
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(1344, 570);
- this.splitMx1.SplitterPosition = 103;
+ this.splitMx1.Size = new System.Drawing.Size(1680, 698);
+ this.splitMx1.SplitterPosition = 126;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.ucBtnPrintAll1);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_gysNo);
this.layoutMx1.Controls.Add(this.txt_barcodeProgress);
@@ -599,108 +612,120 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem14});
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(638, 441, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1344, 103);
+ this.layoutMx1.Size = new System.Drawing.Size(1680, 126);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(989, 108);
+ this.lbGuid.Location = new System.Drawing.Point(1236, 132);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(322, 28);
+ this.lbGuid.Size = new System.Drawing.Size(402, 34);
this.lbGuid.TabIndex = 471;
this.lbGuid.Text = "lbGuid";
//
// txt_gysNo
//
- this.txt_gysNo.Location = new System.Drawing.Point(114, 40);
+ this.txt_gysNo.Location = new System.Drawing.Point(137, 50);
+ this.txt_gysNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_gysNo.Name = "txt_gysNo";
this.txt_gysNo.Properties.Appearance.Options.UseFont = true;
- this.txt_gysNo.Size = new System.Drawing.Size(219, 24);
+ this.txt_gysNo.Size = new System.Drawing.Size(280, 28);
this.txt_gysNo.StyleController = this.layoutMx1;
this.txt_gysNo.TabIndex = 467;
//
// txt_barcodeProgress
//
- this.txt_barcodeProgress.Location = new System.Drawing.Point(765, 68);
+ this.txt_barcodeProgress.Location = new System.Drawing.Point(951, 86);
+ this.txt_barcodeProgress.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_barcodeProgress.Name = "txt_barcodeProgress";
this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true;
- this.txt_barcodeProgress.Size = new System.Drawing.Size(220, 24);
+ this.txt_barcodeProgress.Size = new System.Drawing.Size(280, 28);
this.txt_barcodeProgress.StyleController = this.layoutMx1;
this.txt_barcodeProgress.TabIndex = 342;
//
// txt_paperBillNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(439, 12);
+ this.txt_paperBillNo.Location = new System.Drawing.Point(544, 14);
+ this.txt_paperBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_paperBillNo.Name = "txt_paperBillNo";
this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_paperBillNo.Size = new System.Drawing.Size(220, 24);
+ this.txt_paperBillNo.Size = new System.Drawing.Size(280, 28);
this.txt_paperBillNo.StyleController = this.layoutMx1;
this.txt_paperBillNo.TabIndex = 463;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(114, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(137, 14);
+ this.txt_billNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(219, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(280, 28);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
//
// txt_gysName
//
- this.txt_gysName.Location = new System.Drawing.Point(439, 40);
+ this.txt_gysName.Location = new System.Drawing.Point(544, 50);
+ this.txt_gysName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_gysName.Name = "txt_gysName";
this.txt_gysName.Properties.Appearance.Options.UseFont = true;
- this.txt_gysName.Size = new System.Drawing.Size(220, 24);
+ this.txt_gysName.Size = new System.Drawing.Size(280, 28);
this.txt_gysName.StyleController = this.layoutMx1;
this.txt_gysName.TabIndex = 459;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(765, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(951, 14);
+ this.txt_createBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(220, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(280, 28);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 217;
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(114, 68);
+ this.txt_remark.Location = new System.Drawing.Point(137, 86);
+ this.txt_remark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(545, 24);
+ this.txt_remark.Size = new System.Drawing.Size(687, 28);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 235;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(765, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(951, 50);
+ this.txt_createDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(220, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(280, 28);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 252;
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(989, 12);
+ this.txt_fType.Location = new System.Drawing.Point(1235, 14);
+ this.txt_fType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
- this.txt_fType.Size = new System.Drawing.Size(322, 24);
+ this.txt_fType.Size = new System.Drawing.Size(405, 27);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 469;
//
// txt_urgentFlag
//
- this.txt_urgentFlag.Location = new System.Drawing.Point(989, 40);
+ this.txt_urgentFlag.Location = new System.Drawing.Point(1235, 50);
+ this.txt_urgentFlag.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_urgentFlag.Name = "txt_urgentFlag";
this.txt_urgentFlag.Properties.Caption = "鎬ユ枡鏍囪瘑";
- this.txt_urgentFlag.Size = new System.Drawing.Size(322, 24);
+ this.txt_urgentFlag.Size = new System.Drawing.Size(405, 27);
this.txt_urgentFlag.StyleController = this.layoutMx1;
this.txt_urgentFlag.TabIndex = 470;
//
@@ -730,7 +755,8 @@
this.layoutControlItem13,
this.layoutControlItem2,
this.layoutControlItem3,
- this.layoutControlItem12});
+ this.layoutControlItem12,
+ this.layoutControlItem5});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -756,7 +782,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1323, 104);
+ this.Root.Size = new System.Drawing.Size(1654, 132);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -764,50 +790,50 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(407, 36);
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_paperBillNo;
this.layoutControlItem4.CustomizationFormText = "Srm閫佽揣鍗曞彿";
- this.layoutControlItem4.Location = new System.Drawing.Point(325, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(407, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(407, 36);
this.layoutControlItem4.Text = "Srm閫佽揣鍗曞彿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_createBy;
- this.layoutControlItem7.Location = new System.Drawing.Point(651, 0);
+ this.layoutControlItem7.Location = new System.Drawing.Point(814, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(407, 36);
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_createDate;
this.layoutControlItem8.CustomizationFormText = "鍒涘缓鏃ユ湡";
- this.layoutControlItem8.Location = new System.Drawing.Point(651, 28);
+ this.layoutControlItem8.Location = new System.Drawing.Point(814, 36);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(407, 36);
this.layoutControlItem8.Text = "鍒涘缓鏃ユ湡";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fType;
- this.layoutControlItem10.Location = new System.Drawing.Point(977, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(1221, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(409, 36);
this.layoutControlItem10.Text = "鎻愪氦鐘舵��";
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
@@ -815,11 +841,11 @@
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_urgentFlag;
- this.layoutControlItem11.Location = new System.Drawing.Point(977, 28);
+ this.layoutControlItem11.Location = new System.Drawing.Point(1221, 36);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(409, 36);
this.layoutControlItem11.Text = "鎬ユ枡鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -827,53 +853,54 @@
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_barcodeProgress;
- this.layoutControlItem13.Location = new System.Drawing.Point(651, 56);
+ this.layoutControlItem13.Location = new System.Drawing.Point(814, 72);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(407, 36);
this.layoutControlItem13.Text = "鏉＄爜鎵撳嵃姣旂巼";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_gysName;
- this.layoutControlItem2.Location = new System.Drawing.Point(325, 28);
+ this.layoutControlItem2.Location = new System.Drawing.Point(407, 36);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(407, 36);
this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_gysNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 36);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(407, 36);
this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remark;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 72);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(651, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(814, 36);
this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(108, 22);
//
// 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(1344, 455);
+ this.tabMx.Size = new System.Drawing.Size(1680, 557);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -882,8 +909,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(1342, 423);
+ this.tabMxPage1.Size = new System.Drawing.Size(1678, 519);
this.tabMxPage1.Text = "鏉ユ枡鏄庣粏";
//
// split99
@@ -891,6 +919,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
@@ -903,8 +932,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(1342, 423);
- this.split99.SplitterPosition = 136;
+ this.split99.Size = new System.Drawing.Size(1678, 519);
+ this.split99.SplitterPosition = 166;
this.split99.TabIndex = 2;
//
// layout99
@@ -924,10 +953,11 @@
this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem24});
this.layout99.Location = new System.Drawing.Point(0, 0);
+ this.layout99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layout99.Name = "layout99";
this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(31, 355, 812, 500);
this.layout99.Root = this.layoutControlGroup1;
- this.layout99.Size = new System.Drawing.Size(1342, 136);
+ this.layout99.Size = new System.Drawing.Size(1678, 166);
this.layout99.TabIndex = 0;
this.layout99.Text = "layoutControl1";
//
@@ -935,21 +965,23 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 76);
+ this.layoutControl1.Location = new System.Drawing.Point(840, 108);
+ 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, 28);
+ this.layoutControl1.Size = new System.Drawing.Size(409, 44);
this.layoutControl1.TabIndex = 477;
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.Properties.UseMaskAsDisplayFormat = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(77, 28);
this.txt_iCount_1.StyleController = this.layoutControl1;
this.txt_iCount_1.TabIndex = 264;
this.txt_iCount_1.Tag = "ReadOnly";
@@ -957,10 +989,11 @@
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(329, 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(78, 28);
this.txt_yuliang_1.StyleController = this.layoutControl1;
this.txt_yuliang_1.TabIndex = 265;
//
@@ -985,7 +1018,7 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition4});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(409, 44);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem26
@@ -993,25 +1026,26 @@
this.layoutControlItem26.Control = this.txt_iCount_1;
this.layoutControlItem26.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem26.Name = "layoutControlItem26";
- this.layoutControlItem26.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem26.Size = new System.Drawing.Size(204, 44);
this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
- this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_yuliang_1;
- this.layoutControlItem27.Location = new System.Drawing.Point(168, 0);
+ this.layoutControlItem27.Location = new System.Drawing.Point(204, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem27.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem27.Size = new System.Drawing.Size(205, 44);
this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(108, 22);
//
// lbMxGuid
//
- this.lbMxGuid.Location = new System.Drawing.Point(1032, 119);
+ this.lbMxGuid.Location = new System.Drawing.Point(1290, 145);
+ 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.layout99;
this.lbMxGuid.TabIndex = 229;
this.lbMxGuid.Text = "lbMxGuid";
@@ -1021,16 +1055,16 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1030, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1251, 59);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = "rpt_daa";
- this.ucBtnPrint1.Size = new System.Drawing.Size(340, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(415, 47);
this.ucBtnPrint1.TabIndex = 232;
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(1030, 10);
+ this.radOut.Location = new System.Drawing.Point(1251, 12);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1039,17 +1073,18 @@
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(340, 32);
+ this.radOut.Size = new System.Drawing.Size(415, 47);
this.radOut.StyleController = this.layout99;
this.radOut.TabIndex = 476;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(963, 61);
+ 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.Properties.UseMaskAsDisplayFormat = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(286, 28);
this.txt_psnQty_1.StyleController = this.layout99;
this.txt_psnQty_1.TabIndex = 263;
this.txt_psnQty_1.Tag = "ReadOnly";
@@ -1057,63 +1092,69 @@
//
// 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(286, 28);
this.txtWlid.StyleController = this.layout99;
this.txtWlid.TabIndex = 214;
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 44);
+ this.txtWlmc.Location = new System.Drawing.Point(137, 61);
+ 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(286, 28);
this.txtWlmc.StyleController = this.layout99;
this.txtWlmc.TabIndex = 216;
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 76);
+ this.txtWlgg.Location = new System.Drawing.Point(137, 108);
+ 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(699, 28);
this.txtWlgg.StyleController = this.layout99;
this.txtWlgg.TabIndex = 218;
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(794, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(963, 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(286, 28);
this.txt_kQty.StyleController = this.layout99;
this.txt_kQty.TabIndex = 224;
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(454, 12);
+ this.txtQuantity.Location = new System.Drawing.Point(550, 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(286, 28);
this.txtQuantity.StyleController = this.layout99;
this.txtQuantity.TabIndex = 220;
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 44);
+ this.txt_yQty.Location = new System.Drawing.Point(550, 61);
+ 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(286, 28);
this.txt_yQty.StyleController = this.layout99;
this.txt_yQty.TabIndex = 222;
//
@@ -1169,7 +1210,7 @@
rowDefinition5,
rowDefinition6,
rowDefinition7});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1678, 166);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem15
@@ -1177,81 +1218,81 @@
this.layoutControlItem15.Control = this.txtWlid;
this.layoutControlItem15.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(413, 47);
this.layoutControlItem15.Text = "鐗╂枡缂栧彿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txtWlmc;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 47);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem16.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem16.Size = new System.Drawing.Size(413, 47);
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.txtWlgg;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 94);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(680, 32);
+ this.layoutControlItem17.Size = new System.Drawing.Size(826, 48);
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.txtQuantity;
- this.layoutControlItem18.Location = new System.Drawing.Point(340, 0);
+ this.layoutControlItem18.Location = new System.Drawing.Point(413, 0);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem18.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem18.Size = new System.Drawing.Size(413, 47);
this.layoutControlItem18.Text = "鏈鏀惰揣鎬婚噺";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_yQty;
- this.layoutControlItem19.Location = new System.Drawing.Point(340, 32);
+ this.layoutControlItem19.Location = new System.Drawing.Point(413, 47);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem19.Size = new System.Drawing.Size(413, 47);
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_kQty;
- this.layoutControlItem20.Location = new System.Drawing.Point(680, 0);
+ this.layoutControlItem20.Location = new System.Drawing.Point(826, 0);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem20.Size = new System.Drawing.Size(413, 47);
this.layoutControlItem20.Text = "鍙墦鍗版�绘暟";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_psnQty_1;
- this.layoutControlItem21.Location = new System.Drawing.Point(680, 32);
+ this.layoutControlItem21.Location = new System.Drawing.Point(826, 47);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(413, 47);
this.layoutControlItem21.Text = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(108, 22);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.radOut;
- this.layoutControlItem22.Location = new System.Drawing.Point(1020, 0);
+ this.layoutControlItem22.Location = new System.Drawing.Point(1239, 0);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem22.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem22.Size = new System.Drawing.Size(415, 47);
this.layoutControlItem22.Text = "鑷姩璁＄畻";
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@@ -1259,12 +1300,12 @@
// layoutControlItem23
//
this.layoutControlItem23.Control = this.ucBtnPrint1;
- this.layoutControlItem23.Location = new System.Drawing.Point(1020, 32);
+ this.layoutControlItem23.Location = new System.Drawing.Point(1239, 47);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem23.Size = new System.Drawing.Size(415, 47);
this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -1272,11 +1313,11 @@
// layoutControlItem25
//
this.layoutControlItem25.Control = this.layoutControl1;
- this.layoutControlItem25.Location = new System.Drawing.Point(680, 64);
+ this.layoutControlItem25.Location = new System.Drawing.Point(826, 94);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem25.Size = new System.Drawing.Size(413, 48);
this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
@@ -1284,10 +1325,12 @@
// 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.Size = new System.Drawing.Size(1342, 275);
+ this.gcMx1.Size = new System.Drawing.Size(1678, 338);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1314,6 +1357,7 @@
this.gridColumn19,
this.gridColumn12,
this.gridColumn27});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1327,118 +1371,118 @@
//
this.gvAbtGuid.Caption = "abtGuid涓嶈兘鍒犻櫎";
this.gvAbtGuid.FieldName = "aboutGuid";
- this.gvAbtGuid.MinWidth = 50;
+ this.gvAbtGuid.MinWidth = 62;
this.gvAbtGuid.Name = "gvAbtGuid";
this.gvAbtGuid.OptionsColumn.ReadOnly = true;
- this.gvAbtGuid.Width = 94;
+ this.gvAbtGuid.Width = 117;
//
// gvMx1guid
//
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 70;
+ this.gvMx1guid.MinWidth = 87;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 100;
+ this.gvMx1guid.Width = 125;
//
// gvMx1urgentFlag
//
this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
this.gvMx1urgentFlag.FieldName = "urgentFlagTxt";
- this.gvMx1urgentFlag.MinWidth = 10;
+ this.gvMx1urgentFlag.MinWidth = 12;
this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
this.gvMx1urgentFlag.Visible = true;
this.gvMx1urgentFlag.VisibleIndex = 0;
- this.gvMx1urgentFlag.Width = 10;
+ this.gvMx1urgentFlag.Width = 12;
//
// gvMx1ebeln
//
this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
this.gvMx1ebeln.Caption = "ERP閲囪喘鍗曞彿";
this.gvMx1ebeln.FieldName = "ebeln";
- this.gvMx1ebeln.MinWidth = 50;
+ this.gvMx1ebeln.MinWidth = 62;
this.gvMx1ebeln.Name = "gvMx1ebeln";
this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
this.gvMx1ebeln.Tag = "query_a.ebeln";
this.gvMx1ebeln.Visible = true;
this.gvMx1ebeln.VisibleIndex = 1;
- this.gvMx1ebeln.Width = 105;
+ this.gvMx1ebeln.Width = 131;
//
// gridColumn4
//
this.gridColumn4.Caption = "鐗╂枡缂栧彿";
this.gridColumn4.FieldName = "itemNo";
- this.gridColumn4.MinWidth = 50;
+ this.gridColumn4.MinWidth = 62;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 2;
- this.gridColumn4.Width = 88;
+ this.gridColumn4.Width = 110;
//
// gvMx1boardStyle
//
this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true;
this.gvMx1boardStyle.Caption = "鐗╂枡鍚嶇О";
this.gvMx1boardStyle.FieldName = "itemName";
- this.gvMx1boardStyle.MinWidth = 50;
+ this.gvMx1boardStyle.MinWidth = 62;
this.gvMx1boardStyle.Name = "gvMx1boardStyle";
this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
this.gvMx1boardStyle.Tag = "query_a.board_style";
this.gvMx1boardStyle.Visible = true;
this.gvMx1boardStyle.VisibleIndex = 3;
- this.gvMx1boardStyle.Width = 159;
+ this.gvMx1boardStyle.Width = 199;
//
// gridColumn6
//
this.gridColumn6.Caption = "鐗╂枡瑙勬牸";
this.gridColumn6.FieldName = "itemModel";
- this.gridColumn6.MinWidth = 50;
+ this.gridColumn6.MinWidth = 62;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 4;
- this.gridColumn6.Width = 109;
+ this.gridColumn6.Width = 136;
//
// gridColumn8
//
this.gridColumn8.Caption = "鏈鏀惰揣鏁伴噺";
this.gridColumn8.FieldName = "quantity";
- this.gridColumn8.MinWidth = 50;
+ this.gridColumn8.MinWidth = 62;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣={0:0.##}")});
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 5;
- this.gridColumn8.Width = 83;
+ this.gridColumn8.Width = 104;
//
// gvMx1okRkqty
//
this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
this.gvMx1okRkqty.Caption = "宸插叆搴撴暟閲�";
this.gvMx1okRkqty.FieldName = "okRkqty";
- this.gvMx1okRkqty.MinWidth = 50;
+ this.gvMx1okRkqty.MinWidth = 62;
this.gvMx1okRkqty.Name = "gvMx1okRkqty";
this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
this.gvMx1okRkqty.Visible = true;
this.gvMx1okRkqty.VisibleIndex = 6;
- this.gvMx1okRkqty.Width = 88;
+ this.gvMx1okRkqty.Width = 110;
//
// gvMx1ebelnQty
//
this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
this.gvMx1ebelnQty.Caption = "宸叉墦鍗版暟閲�";
this.gvMx1ebelnQty.FieldName = "yQty";
- this.gvMx1ebelnQty.MinWidth = 50;
+ this.gvMx1ebelnQty.MinWidth = 62;
this.gvMx1ebelnQty.Name = "gvMx1ebelnQty";
this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
this.gvMx1ebelnQty.Visible = true;
this.gvMx1ebelnQty.VisibleIndex = 7;
- this.gvMx1ebelnQty.Width = 88;
+ this.gvMx1ebelnQty.Width = 110;
//
// gridColumn10
//
@@ -1448,70 +1492,70 @@
this.gridColumn10.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn10.Caption = "鍙墦鍗版�婚噺";
this.gridColumn10.FieldName = "kQty";
- this.gridColumn10.MinWidth = 50;
+ this.gridColumn10.MinWidth = 62;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 8;
- this.gridColumn10.Width = 83;
+ this.gridColumn10.Width = 104;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡鍗曚綅";
this.gridColumn5.FieldName = "wnDw";
- this.gridColumn5.MinWidth = 50;
+ this.gridColumn5.MinWidth = 62;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
- this.gridColumn5.Width = 159;
+ this.gridColumn5.Width = 199;
//
// gridColumn9
//
this.gridColumn9.Caption = "閲囪喘鍗曚綅";
this.gridColumn9.FieldName = "cgUnit";
- this.gridColumn9.MinWidth = 50;
+ this.gridColumn9.MinWidth = 62;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 10;
- this.gridColumn9.Width = 83;
+ this.gridColumn9.Width = 104;
//
// gridColumn7
//
this.gridColumn7.Caption = "搴撳瓨鍗曚綅";
this.gridColumn7.FieldName = "kcUnit";
- this.gridColumn7.MinWidth = 50;
+ this.gridColumn7.MinWidth = 62;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
- this.gridColumn7.Width = 83;
+ this.gridColumn7.Width = 104;
//
// gridColumn15
//
this.gridColumn15.Caption = "妫�楠岀姸鎬�";
this.gridColumn15.FieldName = "jyzt";
- this.gridColumn15.MinWidth = 50;
+ this.gridColumn15.MinWidth = 62;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 11;
- this.gridColumn15.Width = 83;
+ this.gridColumn15.Width = 104;
//
// gridColumn19
//
this.gridColumn19.Caption = "妫�楠岀粨鏋�";
this.gridColumn19.FieldName = "jyjg";
- this.gridColumn19.MinWidth = 50;
+ this.gridColumn19.MinWidth = 62;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 12;
- this.gridColumn19.Width = 91;
+ this.gridColumn19.Width = 114;
//
// gridColumn12
//
this.gridColumn12.Caption = "澶勭悊鎰忚";
this.gridColumn12.FieldName = "clyj";
- this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.MinWidth = 31;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 13;
- this.gridColumn12.Width = 94;
+ this.gridColumn12.Width = 117;
//
// gridColumn27
//
@@ -1521,26 +1565,29 @@
this.gridColumn27.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn27.Caption = "榛樿姣忓紶鏉＄爜鏁伴噺";
this.gridColumn27.FieldName = "mrtmsl";
- this.gridColumn27.MinWidth = 25;
+ this.gridColumn27.MinWidth = 31;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.Visible = true;
this.gridColumn27.VisibleIndex = 9;
- this.gridColumn27.Width = 94;
+ this.gridColumn27.Width = 117;
//
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx2);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1342, 423);
+ this.tabMxPage2.Size = new System.Drawing.Size(1678, 514);
this.tabMxPage2.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(1342, 423);
+ this.gcMx2.Size = new System.Drawing.Size(1678, 514);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1550,7 +1597,7 @@
this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gvMx2.Appearance.Row.Options.UseFont = true;
- this.gvMx2.ColumnPanelRowHeight = 50;
+ this.gvMx2.ColumnPanelRowHeight = 61;
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx2guid,
this.gridColumn16,
@@ -1565,6 +1612,7 @@
this.gridColumn22,
this.gridColumn23,
this.gridColumn24});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1577,163 +1625,187 @@
this.gvMx2guid.AppearanceCell.Options.UseFont = true;
this.gvMx2guid.Caption = "guid ";
this.gvMx2guid.FieldName = "guid";
- this.gvMx2guid.MinWidth = 50;
+ this.gvMx2guid.MinWidth = 62;
this.gvMx2guid.Name = "gvMx2guid";
this.gvMx2guid.Tag = "query_a.guid";
- this.gvMx2guid.Width = 94;
+ this.gvMx2guid.Width = 117;
//
// gridColumn16
//
this.gridColumn16.Caption = "鏄惁鍏ュ簱";
this.gridColumn16.FieldName = "isRk";
- this.gridColumn16.MaxWidth = 50;
- this.gridColumn16.MinWidth = 50;
+ this.gridColumn16.MaxWidth = 62;
+ this.gridColumn16.MinWidth = 62;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 0;
- this.gridColumn16.Width = 50;
+ this.gridColumn16.Width = 62;
//
// gvMx2itemBarcode
//
this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx2itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx2itemBarcode.FieldName = "itemBarcode";
- this.gvMx2itemBarcode.MinWidth = 50;
+ this.gvMx2itemBarcode.MinWidth = 62;
this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx2itemBarcode.Visible = true;
this.gvMx2itemBarcode.VisibleIndex = 1;
- this.gvMx2itemBarcode.Width = 300;
+ this.gvMx2itemBarcode.Width = 375;
//
// gvMx2itemNo
//
this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
this.gvMx2itemNo.FieldName = "itemNo";
- this.gvMx2itemNo.MinWidth = 50;
+ this.gvMx2itemNo.MinWidth = 62;
this.gvMx2itemNo.Name = "gvMx2itemNo";
this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
this.gvMx2itemNo.Visible = true;
this.gvMx2itemNo.VisibleIndex = 2;
- this.gvMx2itemNo.Width = 100;
+ this.gvMx2itemNo.Width = 125;
//
// gridColumn18
//
this.gridColumn18.Caption = "鐗╂枡鍚嶇О";
this.gridColumn18.FieldName = "itemName";
- this.gridColumn18.MinWidth = 50;
+ this.gridColumn18.MinWidth = 62;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 3;
- this.gridColumn18.Width = 150;
+ this.gridColumn18.Width = 187;
//
// gridColumn14
//
this.gridColumn14.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn14.FieldName = "itemModel";
- this.gridColumn14.MinWidth = 50;
+ this.gridColumn14.MinWidth = 62;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 4;
- this.gridColumn14.Width = 150;
+ this.gridColumn14.Width = 187;
//
// gvMx2oldqty
//
this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
this.gvMx2oldqty.Caption = "鏁伴噺";
this.gvMx2oldqty.FieldName = "quantity";
- this.gvMx2oldqty.MinWidth = 50;
+ this.gvMx2oldqty.MinWidth = 62;
this.gvMx2oldqty.Name = "gvMx2oldqty";
this.gvMx2oldqty.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣={0:0.##}")});
this.gvMx2oldqty.Tag = "query_a.OLDQTY";
this.gvMx2oldqty.Visible = true;
this.gvMx2oldqty.VisibleIndex = 5;
- this.gvMx2oldqty.Width = 94;
+ this.gvMx2oldqty.Width = 117;
//
// gridColumn21
//
this.gridColumn21.Caption = "鍗曚綅";
this.gridColumn21.FieldName = "dwName";
- this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.MinWidth = 31;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 6;
- this.gridColumn21.Width = 94;
+ this.gridColumn21.Width = 117;
//
// gridColumn20
//
this.gridColumn20.Caption = "鎵撶爜浜�";
this.gridColumn20.FieldName = "createBy";
- this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.MinWidth = 31;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 7;
- this.gridColumn20.Width = 94;
+ this.gridColumn20.Width = 117;
//
// gridColumn17
//
this.gridColumn17.Caption = "鎵撶爜鏃ユ湡";
this.gridColumn17.FieldName = "createDate";
- this.gridColumn17.MinWidth = 10;
+ this.gridColumn17.MinWidth = 12;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 8;
- this.gridColumn17.Width = 180;
+ this.gridColumn17.Width = 225;
//
// gridColumn22
//
this.gridColumn22.Caption = "鍏ュ簱浜�";
this.gridColumn22.FieldName = "rkUser";
- this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.MinWidth = 31;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 9;
- this.gridColumn22.Width = 94;
+ this.gridColumn22.Width = 117;
//
// gridColumn23
//
this.gridColumn23.Caption = "鍏ュ簱鏃ユ湡";
this.gridColumn23.FieldName = "rkDate";
- this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.MinWidth = 31;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
this.gridColumn23.VisibleIndex = 10;
- this.gridColumn23.Width = 94;
+ this.gridColumn23.Width = 117;
//
// gridColumn24
//
this.gridColumn24.Caption = "鍏ュ簱浣�";
this.gridColumn24.FieldName = "rkPositon";
- this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.MinWidth = 31;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 11;
- this.gridColumn24.Width = 94;
+ this.gridColumn24.Width = 117;
//
// xtraTabPageReport
//
this.xtraTabPageReport.Controls.Add(this.ucRptCgdhdPrint1);
this.xtraTabPageReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
+ this.xtraTabPageReport.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPageReport.Name = "xtraTabPageReport";
- this.xtraTabPageReport.Size = new System.Drawing.Size(1344, 570);
+ this.xtraTabPageReport.Size = new System.Drawing.Size(1680, 698);
this.xtraTabPageReport.Text = "鎶ヨ〃";
//
// ucRptCgdhdPrint1
//
this.ucRptCgdhdPrint1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ucRptCgdhdPrint1.Location = new System.Drawing.Point(0, 0);
+ this.ucRptCgdhdPrint1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.ucRptCgdhdPrint1.Name = "ucRptCgdhdPrint1";
- this.ucRptCgdhdPrint1.Size = new System.Drawing.Size(1344, 570);
+ this.ucRptCgdhdPrint1.Size = new System.Drawing.Size(1680, 698);
this.ucRptCgdhdPrint1.TabIndex = 0;
+ //
+ // ucBtnPrintAll1
+ //
+ this.ucBtnPrintAll1.Location = new System.Drawing.Point(1235, 86);
+ this.ucBtnPrintAll1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.ucBtnPrintAll1.mxList = null;
+ this.ucBtnPrintAll1.Name = "ucBtnPrintAll1";
+ this.ucBtnPrintAll1.rptType = null;
+ this.ucBtnPrintAll1.Size = new System.Drawing.Size(405, 32);
+ this.ucBtnPrintAll1.TabIndex = 472;
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.ucBtnPrintAll1;
+ this.layoutControlItem5.Location = new System.Drawing.Point(1221, 72);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem5.Size = new System.Drawing.Size(409, 36);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem5.TextVisible = false;
//
// Frm_ArrivalBarcode
//
- 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(1346, 682);
+ this.ClientSize = new System.Drawing.Size(1682, 834);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_ArrivalBarcode";
this.Text = "鍒拌揣鏉＄爜鎵撳嵃";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1821,6 +1893,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
this.xtraTabPageReport.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
this.ResumeLayout(false);
}
@@ -1945,5 +2018,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
private DevExpress.XtraTab.XtraTabPage xtraTabPageReport;
private Rpt.UcRptCgdhdPrint ucRptCgdhdPrint1;
+ private UserControl.UcBtnPrintAll ucBtnPrintAll1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index ff3191e..09e97ed 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -102,6 +102,46 @@
{
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["kQty"].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_Arrival";
+ this.ucBtnPrintAll1.mxList = lst;
+ };
#endregion
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
index 7505b7a..fb605c4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -76,7 +76,6 @@
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem();
this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
@@ -132,6 +131,9 @@
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
+ this.txt_orgId = new DevExpress.XtraEditors.TextEdit();
+ this.orgId = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
this.splitMx1.Panel1.SuspendLayout();
@@ -178,7 +180,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
this.panel3.SuspendLayout();
this.panel2.SuspendLayout();
@@ -192,6 +193,9 @@
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_orgId.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.orgId)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit();
this.SuspendLayout();
//
// splitMx1
@@ -199,6 +203,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
@@ -211,8 +216,8 @@
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(1367, 619);
- this.splitMx1.SplitterPosition = 229;
+ this.splitMx1.Size = new System.Drawing.Size(1709, 757);
+ this.splitMx1.SplitterPosition = 280;
this.splitMx1.TabIndex = 0;
//
// splitTop1
@@ -220,6 +225,7 @@
this.splitTop1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitTop1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.splitTop1.Location = new System.Drawing.Point(0, 0);
+ this.splitTop1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitTop1.Name = "splitTop1";
//
// splitTop1.Panel1
@@ -241,8 +247,8 @@
this.splitTop1.Panel2.Controls.Add(this.panel1);
this.splitTop1.Panel2.Text = "Panel2";
this.splitTop1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitTop1.Size = new System.Drawing.Size(1367, 229);
- this.splitTop1.SplitterPosition = 527;
+ this.splitTop1.Size = new System.Drawing.Size(1709, 280);
+ this.splitTop1.SplitterPosition = 659;
this.splitTop1.TabIndex = 0;
//
// layoutMx1
@@ -264,145 +270,163 @@
this.layoutMx1.Controls.Add(this.btnGood);
this.layoutMx1.Controls.Add(this.btnBad);
this.layoutMx1.Controls.Add(this.txt_dianJianPath);
+ this.layoutMx1.Controls.Add(this.txt_orgId);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.orgId});
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(544, 408, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1244, 388, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(828, 229);
+ this.layoutMx1.Size = new System.Drawing.Size(1035, 280);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_gdbh
//
- this.txt_gdbh.Location = new System.Drawing.Point(111, 12);
+ this.txt_gdbh.Location = new System.Drawing.Point(132, 14);
+ this.txt_gdbh.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_gdbh.Name = "txt_gdbh";
this.txt_gdbh.Properties.Appearance.Options.UseFont = true;
this.txt_gdbh.Properties.ReadOnly = true;
- this.txt_gdbh.Size = new System.Drawing.Size(99, 24);
+ this.txt_gdbh.Size = new System.Drawing.Size(130, 28);
this.txt_gdbh.StyleController = this.layoutMx1;
this.txt_gdbh.TabIndex = 4;
//
// txt_gx
//
- this.txt_gx.Location = new System.Drawing.Point(111, 46);
+ this.txt_gx.Location = new System.Drawing.Point(132, 55);
+ this.txt_gx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_gx.Name = "txt_gx";
this.txt_gx.Properties.ReadOnly = true;
- this.txt_gx.Size = new System.Drawing.Size(99, 24);
+ this.txt_gx.Size = new System.Drawing.Size(130, 28);
this.txt_gx.StyleController = this.layoutMx1;
this.txt_gx.TabIndex = 5;
//
// txt_collectBy
//
- this.txt_collectBy.Location = new System.Drawing.Point(111, 81);
+ this.txt_collectBy.Location = new System.Drawing.Point(132, 98);
+ this.txt_collectBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_collectBy.Name = "txt_collectBy";
this.txt_collectBy.Properties.ReadOnly = true;
- this.txt_collectBy.Size = new System.Drawing.Size(99, 24);
+ this.txt_collectBy.Size = new System.Drawing.Size(130, 28);
this.txt_collectBy.StyleController = this.layoutMx1;
this.txt_collectBy.TabIndex = 6;
//
// txt_barCode
//
- this.txt_barCode.Location = new System.Drawing.Point(111, 116);
+ this.txt_barCode.Location = new System.Drawing.Point(132, 141);
+ this.txt_barCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_barCode.Name = "txt_barCode";
this.txt_barCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
this.txt_barCode.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(78)))), ((int)(((byte)(138)))), ((int)(((byte)(200)))));
this.txt_barCode.Properties.Appearance.Options.UseFont = true;
this.txt_barCode.Properties.Appearance.Options.UseForeColor = true;
- this.txt_barCode.Size = new System.Drawing.Size(301, 24);
+ this.txt_barCode.Size = new System.Drawing.Size(383, 28);
this.txt_barCode.StyleController = this.layoutMx1;
this.txt_barCode.TabIndex = 1;
//
// txt_currentBarCode
//
- this.txt_currentBarCode.Location = new System.Drawing.Point(111, 151);
+ this.txt_currentBarCode.Location = new System.Drawing.Point(132, 184);
+ this.txt_currentBarCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_currentBarCode.Name = "txt_currentBarCode";
this.txt_currentBarCode.Properties.ReadOnly = true;
- this.txt_currentBarCode.Size = new System.Drawing.Size(301, 24);
+ this.txt_currentBarCode.Size = new System.Drawing.Size(383, 28);
this.txt_currentBarCode.StyleController = this.layoutMx1;
this.txt_currentBarCode.TabIndex = 8;
//
// txt_gongWei
//
- this.txt_gongWei.Location = new System.Drawing.Point(111, 186);
+ this.txt_gongWei.Location = new System.Drawing.Point(132, 227);
+ this.txt_gongWei.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_gongWei.Name = "txt_gongWei";
this.txt_gongWei.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
this.txt_gongWei.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(78)))), ((int)(((byte)(138)))), ((int)(((byte)(200)))));
this.txt_gongWei.Properties.Appearance.Options.UseFont = true;
this.txt_gongWei.Properties.Appearance.Options.UseForeColor = true;
- this.txt_gongWei.Size = new System.Drawing.Size(99, 24);
+ this.txt_gongWei.Size = new System.Drawing.Size(130, 28);
this.txt_gongWei.StyleController = this.layoutMx1;
this.txt_gongWei.TabIndex = 9;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(313, 12);
+ this.txt_itemNo.Location = new System.Drawing.Point(384, 14);
+ this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.ReadOnly = true;
- this.txt_itemNo.Size = new System.Drawing.Size(99, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(131, 28);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 10;
//
// txt_bc
//
- this.txt_bc.Location = new System.Drawing.Point(313, 46);
+ this.txt_bc.Location = new System.Drawing.Point(384, 55);
+ this.txt_bc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_bc.Name = "txt_bc";
this.txt_bc.Properties.ReadOnly = true;
- this.txt_bc.Size = new System.Drawing.Size(99, 24);
+ this.txt_bc.Size = new System.Drawing.Size(131, 28);
this.txt_bc.StyleController = this.layoutMx1;
this.txt_bc.TabIndex = 11;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(515, 46);
+ this.txt_itemName.Location = new System.Drawing.Point(637, 55);
+ this.txt_itemName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.ReadOnly = true;
- this.txt_itemName.Size = new System.Drawing.Size(99, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(131, 28);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 13;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(515, 12);
+ this.txt_itemModel.Location = new System.Drawing.Point(637, 14);
+ this.txt_itemModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.ReadOnly = true;
- this.txt_itemModel.Size = new System.Drawing.Size(301, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(384, 28);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 14;
//
// txt_sbNo
//
- this.txt_sbNo.Location = new System.Drawing.Point(313, 81);
+ this.txt_sbNo.Location = new System.Drawing.Point(384, 98);
+ this.txt_sbNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_sbNo.Name = "txt_sbNo";
this.txt_sbNo.Properties.ReadOnly = true;
- this.txt_sbNo.Size = new System.Drawing.Size(99, 24);
+ this.txt_sbNo.Size = new System.Drawing.Size(131, 28);
this.txt_sbNo.StyleController = this.layoutMx1;
this.txt_sbNo.TabIndex = 15;
//
// txt_sjXt
//
- this.txt_sjXt.Location = new System.Drawing.Point(515, 81);
+ this.txt_sjXt.Location = new System.Drawing.Point(637, 98);
+ this.txt_sjXt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_sjXt.Name = "txt_sjXt";
this.txt_sjXt.Properties.ReadOnly = true;
- this.txt_sjXt.Size = new System.Drawing.Size(99, 24);
+ this.txt_sjXt.Size = new System.Drawing.Size(131, 28);
this.txt_sjXt.StyleController = this.layoutMx1;
this.txt_sjXt.TabIndex = 16;
//
// txt_yjDate
//
- this.txt_yjDate.Location = new System.Drawing.Point(717, 46);
+ this.txt_yjDate.Location = new System.Drawing.Point(890, 55);
+ this.txt_yjDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_yjDate.Name = "txt_yjDate";
this.txt_yjDate.Properties.ReadOnly = true;
- this.txt_yjDate.Size = new System.Drawing.Size(99, 24);
+ this.txt_yjDate.Size = new System.Drawing.Size(131, 28);
this.txt_yjDate.StyleController = this.layoutMx1;
this.txt_yjDate.TabIndex = 17;
//
// txt_sjDate
//
- this.txt_sjDate.Location = new System.Drawing.Point(717, 81);
+ this.txt_sjDate.Location = new System.Drawing.Point(890, 98);
+ this.txt_sjDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_sjDate.Name = "txt_sjDate";
this.txt_sjDate.Properties.ReadOnly = true;
- this.txt_sjDate.Size = new System.Drawing.Size(99, 24);
+ this.txt_sjDate.Size = new System.Drawing.Size(131, 28);
this.txt_sjDate.StyleController = this.layoutMx1;
this.txt_sjDate.TabIndex = 18;
//
@@ -411,9 +435,10 @@
this.btnGood.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
this.btnGood.Appearance.Options.UseBackColor = true;
this.btnGood.Appearance.Options.UseFont = true;
- this.btnGood.Location = new System.Drawing.Point(416, 116);
+ this.btnGood.Location = new System.Drawing.Point(519, 141);
+ this.btnGood.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnGood.Name = "btnGood";
- this.btnGood.Size = new System.Drawing.Size(198, 96);
+ this.btnGood.Size = new System.Drawing.Size(249, 118);
this.btnGood.StyleController = this.layoutMx1;
this.btnGood.TabIndex = 19;
this.btnGood.Text = "鑹搧";
@@ -423,19 +448,21 @@
this.btnBad.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
this.btnBad.Appearance.Options.UseBackColor = true;
this.btnBad.Appearance.Options.UseFont = true;
- this.btnBad.Location = new System.Drawing.Point(618, 116);
+ this.btnBad.Location = new System.Drawing.Point(772, 141);
+ this.btnBad.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnBad.Name = "btnBad";
- this.btnBad.Size = new System.Drawing.Size(198, 96);
+ this.btnBad.Size = new System.Drawing.Size(249, 118);
this.btnBad.StyleController = this.layoutMx1;
this.btnBad.TabIndex = 20;
this.btnBad.Text = "涓嶈壇鍝�";
//
// txt_dianJianPath
//
- this.txt_dianJianPath.Location = new System.Drawing.Point(313, 186);
+ this.txt_dianJianPath.Location = new System.Drawing.Point(384, 227);
+ this.txt_dianJianPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_dianJianPath.Name = "txt_dianJianPath";
this.txt_dianJianPath.Properties.ReadOnly = true;
- this.txt_dianJianPath.Size = new System.Drawing.Size(99, 24);
+ this.txt_dianJianPath.Size = new System.Drawing.Size(131, 28);
this.txt_dianJianPath.StyleController = this.layoutMx1;
this.txt_dianJianPath.TabIndex = 21;
//
@@ -497,7 +524,7 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(828, 229);
+ this.Root.Size = new System.Drawing.Size(1035, 280);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -508,95 +535,95 @@
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsPrint.AppearanceItem.Options.UseFont = true;
- this.layoutControlItem1.Size = new System.Drawing.Size(202, 34);
+ this.layoutControlItem1.Size = new System.Drawing.Size(252, 41);
this.layoutControlItem1.Text = "宸ュ崟缂栧彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(103, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_gx;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 34);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 41);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(202, 35);
+ this.layoutControlItem2.Size = new System.Drawing.Size(252, 43);
this.layoutControlItem2.Text = "褰撳墠宸ュ簭";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(103, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_collectBy;
this.layoutControlItem3.CustomizationFormText = "鎿嶄綔鍛樺伐";
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 69);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 84);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(202, 35);
+ this.layoutControlItem3.Size = new System.Drawing.Size(252, 43);
this.layoutControlItem3.Text = "鎿嶄綔鍛樺伐";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(103, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_barCode;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 104);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 127);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(404, 35);
+ this.layoutControlItem4.Size = new System.Drawing.Size(505, 43);
this.layoutControlItem4.Text = "鎵拷婧爜";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(103, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_itemNo;
- this.layoutControlItem7.Location = new System.Drawing.Point(202, 0);
+ this.layoutControlItem7.Location = new System.Drawing.Point(252, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(202, 34);
+ this.layoutControlItem7.Size = new System.Drawing.Size(253, 41);
this.layoutControlItem7.Text = "浜у搧缂栫爜";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(103, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_bc;
- this.layoutControlItem8.Location = new System.Drawing.Point(202, 34);
+ this.layoutControlItem8.Location = new System.Drawing.Point(252, 41);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(202, 35);
+ this.layoutControlItem8.Size = new System.Drawing.Size(253, 43);
this.layoutControlItem8.Text = "鐝";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(103, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_currentBarCode;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 139);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 170);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem5.Size = new System.Drawing.Size(404, 35);
+ this.layoutControlItem5.Size = new System.Drawing.Size(505, 43);
this.layoutControlItem5.Text = "褰撳墠鏉＄爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(103, 22);
//
// layShuiJian
//
this.layShuiJian.Control = this.txt_gongWei;
- this.layShuiJian.Location = new System.Drawing.Point(0, 174);
+ this.layShuiJian.Location = new System.Drawing.Point(0, 213);
this.layShuiJian.Name = "layShuiJian";
this.layShuiJian.OptionsTableLayoutItem.RowIndex = 5;
- this.layShuiJian.Size = new System.Drawing.Size(202, 35);
+ this.layShuiJian.Size = new System.Drawing.Size(252, 43);
this.layShuiJian.Text = "鎵伐浣嶇爜";
- this.layShuiJian.TextSize = new System.Drawing.Size(87, 18);
+ this.layShuiJian.TextSize = new System.Drawing.Size(103, 22);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.btnGood;
- this.layoutControlItem16.Location = new System.Drawing.Point(404, 104);
- this.layoutControlItem16.MaxSize = new System.Drawing.Size(0, 100);
- this.layoutControlItem16.MinSize = new System.Drawing.Size(41, 100);
+ this.layoutControlItem16.Location = new System.Drawing.Point(505, 127);
+ this.layoutControlItem16.MaxSize = new System.Drawing.Size(0, 122);
+ this.layoutControlItem16.MinSize = new System.Drawing.Size(51, 122);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowSpan = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(202, 105);
+ this.layoutControlItem16.Size = new System.Drawing.Size(253, 129);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "鑹搧鎸夐挳";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -605,14 +632,14 @@
// layoutControlItem17
//
this.layoutControlItem17.Control = this.btnBad;
- this.layoutControlItem17.Location = new System.Drawing.Point(606, 104);
- this.layoutControlItem17.MaxSize = new System.Drawing.Size(0, 100);
- this.layoutControlItem17.MinSize = new System.Drawing.Size(56, 100);
+ this.layoutControlItem17.Location = new System.Drawing.Point(758, 127);
+ this.layoutControlItem17.MaxSize = new System.Drawing.Size(0, 122);
+ this.layoutControlItem17.MinSize = new System.Drawing.Size(70, 122);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowSpan = 3;
- this.layoutControlItem17.Size = new System.Drawing.Size(202, 105);
+ this.layoutControlItem17.Size = new System.Drawing.Size(253, 129);
this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem17.Text = "涓嶈壇鍝佹寜閽�";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
@@ -621,89 +648,79 @@
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_sbNo;
- this.layoutControlItem12.Location = new System.Drawing.Point(202, 69);
+ this.layoutControlItem12.Location = new System.Drawing.Point(252, 84);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(202, 35);
+ this.layoutControlItem12.Size = new System.Drawing.Size(253, 43);
this.layoutControlItem12.Text = "璁惧缂栫爜";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(103, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_sjDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(606, 69);
+ this.layoutControlItem15.Location = new System.Drawing.Point(758, 84);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(202, 35);
+ this.layoutControlItem15.Size = new System.Drawing.Size(253, 43);
this.layoutControlItem15.Text = "Mes瀹為檯寮�宸�";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(103, 22);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_yjDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(606, 34);
+ this.layoutControlItem14.Location = new System.Drawing.Point(758, 41);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(202, 35);
+ this.layoutControlItem14.Size = new System.Drawing.Size(253, 43);
this.layoutControlItem14.Text = "Mes璁″垝寮�宸�";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(103, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_sjXt;
this.layoutControlItem13.CustomizationFormText = "鐢熶骇绾垮埆";
- this.layoutControlItem13.Location = new System.Drawing.Point(404, 69);
+ this.layoutControlItem13.Location = new System.Drawing.Point(505, 84);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(202, 35);
+ this.layoutControlItem13.Size = new System.Drawing.Size(253, 43);
this.layoutControlItem13.Text = "鐢熶骇绾垮埆";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(103, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_itemName;
- this.layoutControlItem10.Location = new System.Drawing.Point(404, 34);
+ this.layoutControlItem10.Location = new System.Drawing.Point(505, 41);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(202, 35);
+ this.layoutControlItem10.Size = new System.Drawing.Size(253, 43);
this.layoutControlItem10.Text = "浜у搧鍚嶇О";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(103, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemModel;
- this.layoutControlItem11.Location = new System.Drawing.Point(404, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(505, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(404, 34);
+ this.layoutControlItem11.Size = new System.Drawing.Size(506, 41);
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18);
- //
- // layDianJian
- //
- this.layDianJian.Control = this.txt_dianJianPath;
- this.layDianJian.Location = new System.Drawing.Point(202, 174);
- this.layDianJian.Name = "layDianJian";
- this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layDianJian.OptionsTableLayoutItem.RowIndex = 5;
- this.layDianJian.Size = new System.Drawing.Size(202, 35);
- this.layDianJian.Text = "鐢垫璺緞";
- this.layDianJian.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(103, 22);
//
// simpleButton7
//
this.simpleButton7.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton7.Appearance.Options.UseBackColor = true;
this.simpleButton7.Appearance.Options.UseFont = true;
- this.simpleButton7.Location = new System.Drawing.Point(122, 154);
+ this.simpleButton7.Location = new System.Drawing.Point(152, 188);
+ this.simpleButton7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.simpleButton7.Name = "simpleButton7";
- this.simpleButton7.Size = new System.Drawing.Size(86, 56);
+ this.simpleButton7.Size = new System.Drawing.Size(108, 68);
this.simpleButton7.TabIndex = 10;
this.simpleButton7.Text = "璁惧";
//
@@ -712,9 +729,10 @@
this.simpleButton6.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton6.Appearance.Options.UseBackColor = true;
this.simpleButton6.Appearance.Options.UseFont = true;
- this.simpleButton6.Location = new System.Drawing.Point(425, 154);
+ this.simpleButton6.Location = new System.Drawing.Point(531, 188);
+ this.simpleButton6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.simpleButton6.Name = "simpleButton6";
- this.simpleButton6.Size = new System.Drawing.Size(86, 56);
+ this.simpleButton6.Size = new System.Drawing.Size(108, 68);
this.simpleButton6.TabIndex = 9;
this.simpleButton6.Text = "鍙栨秷";
//
@@ -723,9 +741,10 @@
this.simpleButton5.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton5.Appearance.Options.UseBackColor = true;
this.simpleButton5.Appearance.Options.UseFont = true;
- this.simpleButton5.Location = new System.Drawing.Point(223, 154);
+ this.simpleButton5.Location = new System.Drawing.Point(279, 188);
+ this.simpleButton5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.simpleButton5.Name = "simpleButton5";
- this.simpleButton5.Size = new System.Drawing.Size(86, 56);
+ this.simpleButton5.Size = new System.Drawing.Size(108, 68);
this.simpleButton5.TabIndex = 8;
this.simpleButton5.Text = "鍝佽川";
//
@@ -734,9 +753,10 @@
this.simpleButton4.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton4.Appearance.Options.UseBackColor = true;
this.simpleButton4.Appearance.Options.UseFont = true;
- this.simpleButton4.Location = new System.Drawing.Point(324, 154);
+ this.simpleButton4.Location = new System.Drawing.Point(405, 188);
+ this.simpleButton4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.simpleButton4.Name = "simpleButton4";
- this.simpleButton4.Size = new System.Drawing.Size(86, 56);
+ this.simpleButton4.Size = new System.Drawing.Size(108, 68);
this.simpleButton4.TabIndex = 7;
this.simpleButton4.Text = "鍏跺畠";
//
@@ -745,18 +765,20 @@
this.simpleButton3.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton3.Appearance.Options.UseBackColor = true;
this.simpleButton3.Appearance.Options.UseFont = true;
- this.simpleButton3.Location = new System.Drawing.Point(21, 154);
+ this.simpleButton3.Location = new System.Drawing.Point(26, 188);
+ this.simpleButton3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.simpleButton3.Name = "simpleButton3";
- this.simpleButton3.Size = new System.Drawing.Size(86, 56);
+ this.simpleButton3.Size = new System.Drawing.Size(108, 68);
this.simpleButton3.TabIndex = 6;
this.simpleButton3.Text = "鐗╂枡";
//
// prog1
//
- this.prog1.Location = new System.Drawing.Point(22, 110);
+ this.prog1.Location = new System.Drawing.Point(28, 134);
+ this.prog1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.prog1.Name = "prog1";
this.prog1.Properties.ShowTitle = true;
- this.prog1.Size = new System.Drawing.Size(489, 26);
+ this.prog1.Size = new System.Drawing.Size(611, 32);
this.prog1.TabIndex = 5;
//
// panel3
@@ -765,9 +787,10 @@
this.panel3.Controls.Add(this.lbSum4);
this.panel3.Controls.Add(this.label6);
this.panel3.ForeColor = System.Drawing.Color.White;
- this.panel3.Location = new System.Drawing.Point(411, 7);
+ this.panel3.Location = new System.Drawing.Point(514, 9);
+ this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(99, 89);
+ this.panel3.Size = new System.Drawing.Size(124, 109);
this.panel3.TabIndex = 4;
//
// lbSum4
@@ -777,18 +800,20 @@
this.lbSum4.Appearance.Options.UseBackColor = true;
this.lbSum4.Appearance.Options.UseBorderColor = true;
this.lbSum4.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.lbSum4.Location = new System.Drawing.Point(0, 42);
+ this.lbSum4.Location = new System.Drawing.Point(0, 52);
+ this.lbSum4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.lbSum4.Name = "lbSum4";
- this.lbSum4.Size = new System.Drawing.Size(99, 47);
+ this.lbSum4.Size = new System.Drawing.Size(124, 57);
this.lbSum4.TabIndex = 3;
this.lbSum4.Text = "0";
//
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(16, 10);
+ this.label6.Location = new System.Drawing.Point(20, 12);
+ this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(68, 18);
+ this.label6.Size = new System.Drawing.Size(82, 22);
this.label6.TabIndex = 0;
this.label6.Text = "涓嶈壇鏁伴噺";
//
@@ -798,9 +823,10 @@
this.panel2.Controls.Add(this.lbSum3);
this.panel2.Controls.Add(this.label4);
this.panel2.ForeColor = System.Drawing.Color.White;
- this.panel2.Location = new System.Drawing.Point(281, 7);
+ this.panel2.Location = new System.Drawing.Point(351, 9);
+ this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(99, 89);
+ this.panel2.Size = new System.Drawing.Size(124, 109);
this.panel2.TabIndex = 3;
//
// lbSum3
@@ -810,18 +836,20 @@
this.lbSum3.Appearance.Options.UseBackColor = true;
this.lbSum3.Appearance.Options.UseBorderColor = true;
this.lbSum3.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.lbSum3.Location = new System.Drawing.Point(0, 42);
+ this.lbSum3.Location = new System.Drawing.Point(0, 52);
+ this.lbSum3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.lbSum3.Name = "lbSum3";
- this.lbSum3.Size = new System.Drawing.Size(99, 47);
+ this.lbSum3.Size = new System.Drawing.Size(124, 57);
this.lbSum3.TabIndex = 3;
this.lbSum3.Text = "0";
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(16, 10);
+ this.label4.Location = new System.Drawing.Point(20, 12);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(68, 18);
+ this.label4.Size = new System.Drawing.Size(82, 22);
this.label4.TabIndex = 0;
this.label4.Text = "鑹搧鏁伴噺";
//
@@ -831,9 +859,10 @@
this.panel4.Controls.Add(this.lbSum2);
this.panel4.Controls.Add(this.label8);
this.panel4.ForeColor = System.Drawing.Color.White;
- this.panel4.Location = new System.Drawing.Point(143, 7);
+ this.panel4.Location = new System.Drawing.Point(179, 9);
+ this.panel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(110, 89);
+ this.panel4.Size = new System.Drawing.Size(138, 109);
this.panel4.TabIndex = 2;
//
// lbSum2
@@ -843,18 +872,20 @@
this.lbSum2.Appearance.Options.UseBackColor = true;
this.lbSum2.Appearance.Options.UseBorderColor = true;
this.lbSum2.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.lbSum2.Location = new System.Drawing.Point(0, 42);
+ this.lbSum2.Location = new System.Drawing.Point(0, 52);
+ this.lbSum2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.lbSum2.Name = "lbSum2";
- this.lbSum2.Size = new System.Drawing.Size(110, 47);
+ this.lbSum2.Size = new System.Drawing.Size(138, 57);
this.lbSum2.TabIndex = 3;
this.lbSum2.Text = "0";
//
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(1, 10);
+ this.label8.Location = new System.Drawing.Point(1, 12);
+ this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(107, 18);
+ this.label8.Size = new System.Drawing.Size(130, 22);
this.label8.TabIndex = 0;
this.label8.Text = "G001:鎶曞叆鏁伴噺";
//
@@ -864,9 +895,10 @@
this.panel1.Controls.Add(this.lbSum1);
this.panel1.Controls.Add(this.label1);
this.panel1.ForeColor = System.Drawing.Color.White;
- this.panel1.Location = new System.Drawing.Point(21, 7);
+ this.panel1.Location = new System.Drawing.Point(26, 9);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(99, 89);
+ this.panel1.Size = new System.Drawing.Size(124, 109);
this.panel1.TabIndex = 0;
//
// lbSum1
@@ -876,18 +908,20 @@
this.lbSum1.Appearance.Options.UseBackColor = true;
this.lbSum1.Appearance.Options.UseBorderColor = true;
this.lbSum1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.lbSum1.Location = new System.Drawing.Point(0, 42);
+ this.lbSum1.Location = new System.Drawing.Point(0, 52);
+ this.lbSum1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.lbSum1.Name = "lbSum1";
- this.lbSum1.Size = new System.Drawing.Size(99, 47);
+ this.lbSum1.Size = new System.Drawing.Size(124, 57);
this.lbSum1.TabIndex = 4;
this.lbSum1.Text = "0";
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(17, 10);
+ this.label1.Location = new System.Drawing.Point(21, 12);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(68, 18);
+ this.label1.Size = new System.Drawing.Size(82, 22);
this.label1.TabIndex = 0;
this.label1.Text = "宸ュ崟鏁伴噺";
//
@@ -895,9 +929,10 @@
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1367, 378);
+ this.tabMx.Size = new System.Drawing.Size(1709, 462);
this.tabMx.TabIndex = 4;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -906,17 +941,20 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1365, 346);
+ this.tabMxPage1.Size = new System.Drawing.Size(1707, 424);
this.tabMxPage1.Text = "鑹搧鏄庣粏";
//
// 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.Size = new System.Drawing.Size(1365, 346);
+ this.gcMx1.Size = new System.Drawing.Size(1707, 424);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -939,6 +977,7 @@
this.gridColumn14,
this.gridColumn15,
this.gridColumn24});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -949,155 +988,163 @@
//
this.gridColumn12.Caption = "guid";
this.gridColumn12.FieldName = "guid";
- this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.MinWidth = 31;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.OptionsColumn.ReadOnly = true;
- this.gridColumn12.Width = 94;
+ this.gridColumn12.Width = 117;
//
// gvMx2status
//
this.gvMx2status.Caption = "宸ュ崟缂栧彿";
this.gvMx2status.FieldName = "gdbh";
- this.gvMx2status.MinWidth = 10;
+ this.gvMx2status.MinWidth = 12;
this.gvMx2status.Name = "gvMx2status";
this.gvMx2status.OptionsColumn.ReadOnly = true;
this.gvMx2status.Tag = "query_a.status";
- this.gvMx2status.Width = 50;
+ this.gvMx2status.Width = 62;
//
// gvMx2pbillNo
//
this.gvMx2pbillNo.Caption = "杩芥函鐮�";
this.gvMx2pbillNo.FieldName = "barCode";
+ this.gvMx2pbillNo.MinWidth = 25;
this.gvMx2pbillNo.Name = "gvMx2pbillNo";
this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
this.gvMx2pbillNo.Tag = "query_a.pbill_no";
this.gvMx2pbillNo.Visible = true;
this.gvMx2pbillNo.VisibleIndex = 0;
- this.gvMx2pbillNo.Width = 94;
+ this.gvMx2pbillNo.Width = 117;
//
// gvMx2itemNo
//
this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
this.gvMx2itemNo.FieldName = "itemNo";
+ this.gvMx2itemNo.MinWidth = 25;
this.gvMx2itemNo.Name = "gvMx2itemNo";
this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
this.gvMx2itemNo.Tag = "query_a.item_no";
this.gvMx2itemNo.Visible = true;
this.gvMx2itemNo.VisibleIndex = 1;
- this.gvMx2itemNo.Width = 94;
+ this.gvMx2itemNo.Width = 117;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
this.gridColumn5.FieldName = "itemName";
+ this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 117;
//
// gridColumn6
//
this.gridColumn6.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn6.FieldName = "itemModel";
+ this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 117;
//
// gridColumn3
//
this.gridColumn3.Caption = "鏁伴噺";
this.gridColumn3.FieldName = "quantity";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 3;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 117;
//
// gvMx2tlQty
//
this.gvMx2tlQty.Caption = "鍗曚綅";
this.gvMx2tlQty.FieldName = "dwName";
+ this.gvMx2tlQty.MinWidth = 25;
this.gvMx2tlQty.Name = "gvMx2tlQty";
this.gvMx2tlQty.OptionsColumn.ReadOnly = true;
this.gvMx2tlQty.Tag = "query_a.tl_qty";
this.gvMx2tlQty.Visible = true;
this.gvMx2tlQty.VisibleIndex = 2;
- this.gvMx2tlQty.Width = 94;
+ this.gvMx2tlQty.Width = 117;
//
// gridColumn2
//
this.gridColumn2.Caption = "宸ュ簭";
this.gridColumn2.FieldName = "processNo";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.ReadOnly = true;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 4;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 117;
//
// gridColumn1
//
this.gridColumn1.Caption = "涓嶈壇鎻忚堪";
this.gridColumn1.FieldName = "badDescription";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 117;
//
// gridColumn4
//
this.gridColumn4.Caption = "缁撴灉";
this.gridColumn4.FieldName = "checkResult";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 5;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 117;
//
// gridColumn14
//
this.gridColumn14.Caption = "涓婃姤浜�";
this.gridColumn14.FieldName = "createBy";
- this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.MinWidth = 31;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.Width = 117;
//
// gridColumn15
//
this.gridColumn15.Caption = "鏈�鍚庝笂鎶ユ椂闂�";
this.gridColumn15.FieldName = "createDate";
- this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.MinWidth = 31;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.OptionsColumn.ReadOnly = true;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.Width = 117;
//
// gridColumn24
//
this.gridColumn24.Caption = "鏁版嵁鐘舵��";
this.gridColumn24.FieldName = "barCodeStatusTxt";
- this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.MinWidth = 31;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.OptionsColumn.ReadOnly = true;
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 6;
- this.gridColumn24.Width = 94;
+ this.gridColumn24.Width = 117;
//
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx2);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1365, 346);
+ this.tabMxPage2.Size = new System.Drawing.Size(1707, 424);
this.tabMxPage2.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(1365, 346);
+ this.gcMx2.Size = new System.Drawing.Size(1707, 424);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1121,6 +1168,7 @@
this.gridColumn22,
this.gridColumn23,
this.gridColumn25});
+ this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1131,159 +1179,196 @@
//
this.gridColumn7.Caption = "guid";
this.gridColumn7.FieldName = "guid";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 117;
//
// gridColumn8
//
this.gridColumn8.Caption = "宸ュ崟缂栧彿";
this.gridColumn8.FieldName = "gdbh";
- this.gridColumn8.MinWidth = 10;
+ this.gridColumn8.MinWidth = 12;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.OptionsColumn.ReadOnly = true;
this.gridColumn8.Tag = "query_a.status";
- this.gridColumn8.Width = 50;
+ this.gridColumn8.Width = 62;
//
// gridColumn9
//
this.gridColumn9.Caption = "杩芥函鐮�";
this.gridColumn9.FieldName = "barCode";
+ this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Tag = "query_a.pbill_no";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 0;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 117;
//
// gridColumn10
//
this.gridColumn10.Caption = "鐗╂枡缂栫爜";
this.gridColumn10.FieldName = "itemNo";
+ this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.OptionsColumn.ReadOnly = true;
this.gridColumn10.Tag = "query_a.item_no";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 1;
- this.gridColumn10.Width = 94;
+ this.gridColumn10.Width = 117;
//
// gridColumn11
//
this.gridColumn11.Caption = "鐗╂枡鍚嶇О";
this.gridColumn11.FieldName = "itemName";
+ this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.OptionsColumn.ReadOnly = true;
- this.gridColumn11.Width = 94;
+ this.gridColumn11.Width = 117;
//
// gridColumn13
//
this.gridColumn13.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn13.FieldName = "itemModel";
+ this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.OptionsColumn.ReadOnly = true;
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 117;
//
// gridColumn16
//
this.gridColumn16.Caption = "鏁伴噺";
this.gridColumn16.FieldName = "quantity";
- this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.MinWidth = 31;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.OptionsColumn.ReadOnly = true;
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 2;
- this.gridColumn16.Width = 94;
+ this.gridColumn16.Width = 117;
//
// gridColumn17
//
this.gridColumn17.Caption = "鍗曚綅";
this.gridColumn17.FieldName = "dwName";
+ this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.OptionsColumn.ReadOnly = true;
this.gridColumn17.Tag = "query_a.tl_qty";
- this.gridColumn17.Width = 94;
+ this.gridColumn17.Width = 117;
//
// gridColumn18
//
this.gridColumn18.Caption = "宸ュ簭";
this.gridColumn18.FieldName = "processNo";
- this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.MinWidth = 31;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.OptionsColumn.ReadOnly = true;
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 3;
- this.gridColumn18.Width = 94;
+ this.gridColumn18.Width = 117;
//
// gridColumn19
//
this.gridColumn19.Caption = "涓嶈壇鎻忚堪";
this.gridColumn19.FieldName = "badDescription";
- this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.MinWidth = 31;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.OptionsColumn.ReadOnly = true;
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 4;
- this.gridColumn19.Width = 94;
+ this.gridColumn19.Width = 117;
//
// gridColumn20
//
this.gridColumn20.Caption = "缁翠慨缁撴灉";
this.gridColumn20.FieldName = "checkResult";
- this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.MinWidth = 31;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.OptionsColumn.ReadOnly = true;
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 5;
- this.gridColumn20.Width = 94;
+ this.gridColumn20.Width = 117;
//
// gridColumn21
//
this.gridColumn21.Caption = "涓婃姤浜�";
this.gridColumn21.FieldName = "createBy";
- this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.MinWidth = 31;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.OptionsColumn.ReadOnly = true;
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 6;
- this.gridColumn21.Width = 94;
+ this.gridColumn21.Width = 117;
//
// gridColumn22
//
this.gridColumn22.Caption = "涓婃姤鏃堕棿";
this.gridColumn22.FieldName = "createDate";
- this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.MinWidth = 31;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.OptionsColumn.ReadOnly = true;
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 7;
- this.gridColumn22.Width = 94;
+ this.gridColumn22.Width = 117;
//
// gridColumn23
//
this.gridColumn23.Caption = "涓嶈壇鍘熷洜";
this.gridColumn23.FieldName = "badReson";
- this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.MinWidth = 31;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.OptionsColumn.ReadOnly = true;
- this.gridColumn23.Width = 94;
+ this.gridColumn23.Width = 117;
//
// gridColumn25
//
this.gridColumn25.Caption = "鏁版嵁鐘舵��";
this.gridColumn25.FieldName = "barCodeStatus";
- this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.MinWidth = 31;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.OptionsColumn.ReadOnly = true;
- this.gridColumn25.Width = 94;
+ this.gridColumn25.Width = 117;
+ //
+ // txt_orgId
+ //
+ this.txt_orgId.Location = new System.Drawing.Point(384, 227);
+ this.txt_orgId.Name = "txt_orgId";
+ this.txt_orgId.Properties.ReadOnly = true;
+ this.txt_orgId.Size = new System.Drawing.Size(131, 28);
+ this.txt_orgId.StyleController = this.layoutMx1;
+ this.txt_orgId.TabIndex = 22;
+ //
+ // orgId
+ //
+ this.orgId.Control = this.txt_orgId;
+ this.orgId.Location = new System.Drawing.Point(252, 213);
+ this.orgId.Name = "orgId";
+ this.orgId.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.orgId.OptionsTableLayoutItem.RowIndex = 5;
+ this.orgId.Size = new System.Drawing.Size(253, 43);
+ this.orgId.Text = "缁勭粐";
+ this.orgId.TextSize = new System.Drawing.Size(62, 24);
+ //
+ // layDianJian
+ //
+ this.layDianJian.Control = this.txt_dianJianPath;
+ this.layDianJian.Location = new System.Drawing.Point(252, 213);
+ this.layDianJian.Name = "layDianJian";
+ this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layDianJian.OptionsTableLayoutItem.RowIndex = 5;
+ this.layDianJian.Size = new System.Drawing.Size(253, 43);
+ this.layDianJian.Text = "鐢垫璺緞";
+ this.layDianJian.TextSize = new System.Drawing.Size(103, 22);
//
// Frm_Work01
//
- 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(1367, 619);
+ this.ClientSize = new System.Drawing.Size(1709, 757);
this.Controls.Add(this.splitMx1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.MinimizeBox = false;
this.Name = "Frm_Work01";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
@@ -1335,7 +1420,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
this.panel3.ResumeLayout(false);
this.panel3.PerformLayout();
@@ -1353,6 +1437,9 @@
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_orgId.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.orgId)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit();
this.ResumeLayout(false);
}
@@ -1447,10 +1534,12 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layDianJian;
private DevExpress.XtraEditors.SimpleButton lbSum4;
private DevExpress.XtraEditors.SimpleButton lbSum3;
private DevExpress.XtraEditors.SimpleButton lbSum2;
private DevExpress.XtraEditors.SimpleButton lbSum1;
+ private DevExpress.XtraEditors.TextEdit txt_orgId;
+ private DevExpress.XtraLayout.LayoutControlItem orgId;
+ private DevExpress.XtraLayout.LayoutControlItem layDianJian;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index a0b748a..17ccd66 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -194,7 +194,17 @@
_type = "宸ュ簭G003:姘存涓嶈壇鎻忚堪";
if (txt_gx.Text.Trim() == fGxZhongJian)
_type = "宸ュ簭G004:缁堟涓嶈壇鎻忚堪";
- UcDictionarySelect frm = new UcDictionarySelect(_type, " a.s_type='" + _type + "' and pid<>'00000000-0000-0000-0000-000000000000'", _msg);
+ string condition = $" pid<>'00000000-0000-0000-0000-000000000000' " ;
+ if(txt_orgId.Text.Trim() == "104554") // 鐢靛櫒
+ {
+ condition += $" and a.s_type = '{_type}' ";
+ }
+ if (txt_orgId.Text.Trim() == "104540") // 榄斿嚒
+ {
+ condition += $" and a.s_type = '榄斿嚒{_type}' ";
+ }
+
+ UcDictionarySelect frm = new UcDictionarySelect(_type, condition, _msg);
frm.UpdateParent += (ss, ee) =>
{
System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
--
Gitblit v1.9.3