From 8daa94248baa30f5606c9486b0c1c5603f9de8b4 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期四, 11 十二月 2025 20:45:39 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~cnf/JH/JH_MesCilent
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 303 ++++++++++++++++++++++++++++++--------------------
1 files changed, 181 insertions(+), 122 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index 281d9cc..861264e 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -59,10 +59,13 @@
this.gv_pba006 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_pba009 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.btnCopyXls = new DevExpress.XtraEditors.SimpleButton();
this.lbGuid = new System.Windows.Forms.Label();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.txt_pba013 = new Gs.DevApp.UserControl.UcLookWorkshop();
@@ -77,11 +80,12 @@
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -144,11 +148,12 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -173,7 +178,7 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(1410, 97);
@@ -185,10 +190,10 @@
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.xtraTabControl1.Location = new System.Drawing.Point(0, 97);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1410, 737);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -197,9 +202,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1408, 699);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -208,7 +213,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, 3, 4, 3);
+ this.split1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -221,19 +226,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1408, 698);
+ this.split1.Size = new System.Drawing.Size(1408, 699);
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, 3, 4, 3);
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1408, 636);
+ this.gcMain1.Size = new System.Drawing.Size(1408, 638);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -254,10 +259,12 @@
this.gv_pba005,
this.gv_pba006,
this.gv_pba009,
- this.gridColumn5});
+ this.gridColumn5,
+ this.gridColumn8,
+ this.gridColumn9});
this.gridView1.DetailHeight = 427;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 63;
+ this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -268,14 +275,14 @@
this.gv_fstatus.AppearanceCell.Options.UseFont = true;
this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
this.gv_fstatus.FieldName = "fstatus";
- this.gv_fstatus.MaxWidth = 63;
- this.gv_fstatus.MinWidth = 63;
+ 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.Visible = true;
this.gv_fstatus.VisibleIndex = 0;
- this.gv_fstatus.Width = 63;
+ this.gv_fstatus.Width = 62;
//
// gridColumn4
//
@@ -286,7 +293,7 @@
this.gridColumn4.Tag = "org.fnamber";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 1;
- this.gridColumn4.Width = 313;
+ this.gridColumn4.Width = 312;
//
// gridColumn1
//
@@ -382,24 +389,44 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Width = 117;
//
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "瀹℃牳浜哄鍚�";
+ this.gridColumn8.FieldName = "checkUserName";
+ this.gridColumn8.MinWidth = 30;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 9;
+ this.gridColumn8.Width = 94;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "鍒涘缓浜哄鍚�";
+ this.gridColumn9.FieldName = "createByName";
+ this.gridColumn9.MinWidth = 30;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 10;
+ this.gridColumn9.Width = 94;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 636);
+ this.pageBar1.Location = new System.Drawing.Point(0, 638);
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(1408, 47);
+ this.pageBar1.Size = new System.Drawing.Size(1408, 46);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
- this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1408, 699);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -407,7 +434,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, 3, 4, 3);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -420,12 +447,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(1408, 698);
- this.splitMx1.SplitterPosition = 134;
+ this.splitMx1.Size = new System.Drawing.Size(1408, 699);
+ this.splitMx1.SplitterPosition = 158;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.btnCopyXls);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.btnSelect);
this.layoutMx1.Controls.Add(this.txt_pba013);
@@ -439,20 +467,30 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem9});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(816, 394, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1408, 134);
+ this.layoutMx1.Size = new System.Drawing.Size(1408, 158);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // btnCopyXls
+ //
+ this.btnCopyXls.Location = new System.Drawing.Point(359, 104);
+ this.btnCopyXls.Margin = new System.Windows.Forms.Padding(4);
+ this.btnCopyXls.Name = "btnCopyXls";
+ this.btnCopyXls.Size = new System.Drawing.Size(165, 34);
+ this.btnCopyXls.StyleController = this.layoutMx1;
+ this.btnCopyXls.TabIndex = 444;
+ this.btnCopyXls.Text = "蹇嵎褰曞叆";
//
// lbGuid
//
this.lbGuid.Location = new System.Drawing.Point(1050, 121);
this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(343, 49);
+ this.lbGuid.Size = new System.Drawing.Size(342, 49);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
@@ -460,10 +498,10 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(17, 95);
- this.btnSelect.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.btnSelect.Location = new System.Drawing.Point(12, 104);
+ this.btnSelect.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(125, 32);
+ this.btnSelect.Size = new System.Drawing.Size(127, 34);
this.btnSelect.StyleController = this.layoutMx1;
this.btnSelect.TabIndex = 456;
this.btnSelect.Text = "閫夊彇鎶曟枡鍗�";
@@ -471,71 +509,71 @@
// txt_pba013
//
this.txt_pba013.IsReadly = false;
- this.txt_pba013.Location = new System.Drawing.Point(112, 57);
- this.txt_pba013.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.txt_pba013.Location = new System.Drawing.Point(102, 58);
+ this.txt_pba013.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.txt_pba013.Name = "txt_pba013";
- this.txt_pba013.Size = new System.Drawing.Size(237, 28);
+ this.txt_pba013.Size = new System.Drawing.Size(253, 28);
this.txt_pba013.TabIndex = 459;
//
// txt_erpSczz
//
this.txt_erpSczz.IsReadly = false;
- this.txt_erpSczz.Location = new System.Drawing.Point(112, 19);
- this.txt_erpSczz.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.txt_erpSczz.Location = new System.Drawing.Point(102, 12);
+ this.txt_erpSczz.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.txt_erpSczz.Name = "txt_erpSczz";
- this.txt_erpSczz.Size = new System.Drawing.Size(237, 28);
+ this.txt_erpSczz.Size = new System.Drawing.Size(253, 28);
this.txt_erpSczz.TabIndex = 460;
//
// txt_hNo
//
- this.txt_hNo.Location = new System.Drawing.Point(450, 19);
- this.txt_hNo.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.txt_hNo.Location = new System.Drawing.Point(449, 12);
+ this.txt_hNo.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.txt_hNo.Name = "txt_hNo";
this.txt_hNo.Properties.Appearance.Options.UseFont = true;
- this.txt_hNo.Size = new System.Drawing.Size(237, 28);
+ this.txt_hNo.Size = new System.Drawing.Size(253, 28);
this.txt_hNo.StyleController = this.layoutMx1;
this.txt_hNo.TabIndex = 458;
this.txt_hNo.Tag = "readonly";
//
// txt_pba009
//
- this.txt_pba009.Location = new System.Drawing.Point(450, 57);
- this.txt_pba009.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.txt_pba009.Location = new System.Drawing.Point(449, 58);
+ this.txt_pba009.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.txt_pba009.Name = "txt_pba009";
this.txt_pba009.Properties.Appearance.Options.UseFont = true;
- this.txt_pba009.Size = new System.Drawing.Size(575, 28);
+ this.txt_pba009.Size = new System.Drawing.Size(600, 28);
this.txt_pba009.StyleController = this.layoutMx1;
this.txt_pba009.TabIndex = 240;
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(1126, 19);
- this.txt_checkUser.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.txt_checkUser.Location = new System.Drawing.Point(1143, 12);
+ this.txt_checkUser.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(239, 28);
+ this.txt_checkUser.Size = new System.Drawing.Size(253, 28);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 273;
this.txt_checkUser.Tag = "readonly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(788, 19);
- this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.txt_checkDate.Location = new System.Drawing.Point(796, 12);
+ this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(237, 28);
+ this.txt_checkDate.Size = new System.Drawing.Size(253, 28);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 267;
this.txt_checkDate.Tag = "readonly";
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(1031, 57);
- this.txt_fstatus.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.txt_fstatus.Location = new System.Drawing.Point(1053, 58);
+ this.txt_fstatus.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_fstatus.Size = new System.Drawing.Size(334, 27);
+ this.txt_fstatus.Size = new System.Drawing.Size(343, 27);
this.txt_fstatus.StyleController = this.layoutMx1;
this.txt_fstatus.TabIndex = 461;
this.txt_fstatus.Tag = "readonly";
@@ -560,11 +598,12 @@
this.layoutControlItem1,
this.layoutControlItem2,
this.layoutControlItem3,
- this.layoutControlItem4,
this.layoutControlItem5,
this.layoutControlItem6,
+ this.layoutControlItem4,
this.layoutControlItem7,
- this.layoutControlItem8});
+ this.layoutControlItem8,
+ this.layoutControlItem10});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -590,7 +629,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1382, 146);
+ this.Root.Size = new System.Drawing.Size(1408, 158);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -598,96 +637,111 @@
this.layoutControlItem1.Control = this.txt_erpSczz;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(338, 38);
+ this.layoutControlItem1.Size = new System.Drawing.Size(347, 46);
this.layoutControlItem1.Text = "鐢熶骇缁勭粐";
this.layoutControlItem1.TextSize = new System.Drawing.Size(78, 22);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_hNo;
- this.layoutControlItem2.Location = new System.Drawing.Point(338, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(347, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(338, 38);
+ this.layoutControlItem2.Size = new System.Drawing.Size(347, 46);
this.layoutControlItem2.Text = "鎺掍骇缂栧彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(78, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_checkDate;
- this.layoutControlItem3.Location = new System.Drawing.Point(676, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(694, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(338, 38);
+ this.layoutControlItem3.Size = new System.Drawing.Size(347, 46);
this.layoutControlItem3.Text = "瀹℃牳鏃ユ湡 ";
this.layoutControlItem3.TextSize = new System.Drawing.Size(78, 22);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_pba013;
- 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(338, 38);
- this.layoutControlItem4.Text = "宸ヤ綔杞﹂棿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(78, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_checkUser;
- this.layoutControlItem5.Location = new System.Drawing.Point(1014, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(1041, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(340, 38);
+ this.layoutControlItem5.Size = new System.Drawing.Size(347, 46);
this.layoutControlItem5.Text = "瀹℃牳浜哄憳";
this.layoutControlItem5.TextSize = new System.Drawing.Size(78, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_fstatus;
- this.layoutControlItem6.Location = new System.Drawing.Point(1014, 38);
+ this.layoutControlItem6.Location = new System.Drawing.Point(1041, 46);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(340, 38);
+ this.layoutControlItem6.Size = new System.Drawing.Size(347, 46);
this.layoutControlItem6.Text = "瀹℃牳鐘舵��";
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem6.TextVisible = false;
//
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_pba013;
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 46);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(347, 46);
+ this.layoutControlItem4.Text = "宸ヤ綔杞﹂棿";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(78, 22);
+ //
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_pba009;
- this.layoutControlItem7.Location = new System.Drawing.Point(338, 38);
+ this.layoutControlItem7.Location = new System.Drawing.Point(347, 46);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(676, 38);
+ this.layoutControlItem7.Size = new System.Drawing.Size(694, 46);
this.layoutControlItem7.Text = "鎺掍骇澶囨敞";
this.layoutControlItem7.TextSize = new System.Drawing.Size(78, 22);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.btnSelect;
- this.layoutControlItem8.Location = new System.Drawing.Point(0, 76);
+ this.layoutControlItem8.Location = new System.Drawing.Point(0, 92);
this.layoutControlItem8.MaxSize = new System.Drawing.Size(131, 38);
this.layoutControlItem8.MinSize = new System.Drawing.Size(131, 38);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(338, 38);
+ this.layoutControlItem8.Size = new System.Drawing.Size(347, 46);
this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem8.Text = "閫夋嫨鎶曟枡鍗�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
//
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.btnCopyXls;
+ this.layoutControlItem10.Location = new System.Drawing.Point(347, 92);
+ this.layoutControlItem10.MaxSize = new System.Drawing.Size(169, 38);
+ this.layoutControlItem10.MinSize = new System.Drawing.Size(161, 38);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem10.Size = new System.Drawing.Size(347, 46);
+ this.layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem10.Text = "浠嶺LS澶嶅埗鏄庣粏";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem10.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, 3, 4, 3);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1408, 549);
+ this.tabMx.Size = new System.Drawing.Size(1408, 526);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -695,18 +749,18 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1406, 511);
+ this.tabMxPage1.Size = new System.Drawing.Size(1406, 488);
this.tabMxPage1.Text = "浠诲姟鍗曟槑缁�";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemDateEdit2,
@@ -714,7 +768,7 @@
this.rptJYBZ,
this.repositoryItemDateEdit3,
this.repositoryItemComboBox1});
- this.gcMx1.Size = new System.Drawing.Size(1406, 511);
+ this.gcMx1.Size = new System.Drawing.Size(1406, 488);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -759,7 +813,7 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "鏄庣粏Guid";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 63;
+ this.gvMx1guid.MinWidth = 62;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
@@ -779,65 +833,65 @@
this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
this.gvMx1daa002.Caption = "宸ュ崟鍗曞彿";
this.gvMx1daa002.FieldName = "daa001";
- this.gvMx1daa002.MinWidth = 63;
+ this.gvMx1daa002.MinWidth = 62;
this.gvMx1daa002.Name = "gvMx1daa002";
this.gvMx1daa002.OptionsColumn.ReadOnly = true;
this.gvMx1daa002.Tag = "query_a.daa002";
this.gvMx1daa002.Visible = true;
this.gvMx1daa002.VisibleIndex = 0;
- this.gvMx1daa002.Width = 63;
+ this.gvMx1daa002.Width = 62;
//
// gvMx1daa010
//
this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
this.gvMx1daa010.Caption = "浠诲姟鍗曞彿";
this.gvMx1daa010.FieldName = "daa021";
- this.gvMx1daa010.MinWidth = 63;
+ this.gvMx1daa010.MinWidth = 62;
this.gvMx1daa010.Name = "gvMx1daa010";
this.gvMx1daa010.OptionsColumn.ReadOnly = true;
this.gvMx1daa010.Tag = "query_a.daa010";
this.gvMx1daa010.Visible = true;
this.gvMx1daa010.VisibleIndex = 1;
- this.gvMx1daa010.Width = 63;
+ this.gvMx1daa010.Width = 62;
//
// gvMx1daa005
//
this.gvMx1daa005.AppearanceCell.Options.UseFont = true;
this.gvMx1daa005.Caption = "鐗╂枡缂栫爜";
this.gvMx1daa005.FieldName = "itemNo";
- this.gvMx1daa005.MinWidth = 63;
+ this.gvMx1daa005.MinWidth = 62;
this.gvMx1daa005.Name = "gvMx1daa005";
this.gvMx1daa005.OptionsColumn.ReadOnly = true;
this.gvMx1daa005.Tag = "query_a.daa005";
this.gvMx1daa005.Visible = true;
this.gvMx1daa005.VisibleIndex = 2;
- this.gvMx1daa005.Width = 63;
+ this.gvMx1daa005.Width = 62;
//
// gvMx1daa003
//
this.gvMx1daa003.AppearanceCell.Options.UseFont = true;
this.gvMx1daa003.Caption = "浜у搧鍚嶇О";
this.gvMx1daa003.FieldName = "daa003";
- this.gvMx1daa003.MinWidth = 63;
+ this.gvMx1daa003.MinWidth = 62;
this.gvMx1daa003.Name = "gvMx1daa003";
this.gvMx1daa003.OptionsColumn.ReadOnly = true;
this.gvMx1daa003.Tag = "query_a.daa003";
this.gvMx1daa003.Visible = true;
this.gvMx1daa003.VisibleIndex = 3;
- this.gvMx1daa003.Width = 63;
+ this.gvMx1daa003.Width = 62;
//
// gvMx1daa004
//
this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
this.gvMx1daa004.Caption = "浜у搧瑙勬牸";
this.gvMx1daa004.FieldName = "daa004";
- this.gvMx1daa004.MinWidth = 63;
+ this.gvMx1daa004.MinWidth = 62;
this.gvMx1daa004.Name = "gvMx1daa004";
this.gvMx1daa004.OptionsColumn.ReadOnly = true;
this.gvMx1daa004.Tag = "query_a.daa004";
this.gvMx1daa004.Visible = true;
this.gvMx1daa004.VisibleIndex = 4;
- this.gvMx1daa004.Width = 63;
+ this.gvMx1daa004.Width = 62;
//
// gvMx1daa016
//
@@ -849,7 +903,7 @@
this.gvMx1daa016.Caption = "Mes棰勮寮�宸�";
this.gvMx1daa016.ColumnEdit = this.repositoryItemDateEdit2;
this.gvMx1daa016.FieldName = "mesStartProd";
- this.gvMx1daa016.MinWidth = 63;
+ this.gvMx1daa016.MinWidth = 62;
this.gvMx1daa016.Name = "gvMx1daa016";
this.gvMx1daa016.Tag = "edit";
this.gvMx1daa016.Visible = true;
@@ -881,12 +935,12 @@
this.gvMx1daa018.Caption = "Mes棰勮瀹屽伐";
this.gvMx1daa018.ColumnEdit = this.repositoryItemDateEdit3;
this.gvMx1daa018.FieldName = "mesEndProd";
- this.gvMx1daa018.MinWidth = 63;
+ this.gvMx1daa018.MinWidth = 62;
this.gvMx1daa018.Name = "gvMx1daa018";
this.gvMx1daa018.Tag = "edit";
this.gvMx1daa018.Visible = true;
this.gvMx1daa018.VisibleIndex = 7;
- this.gvMx1daa018.Width = 63;
+ this.gvMx1daa018.Width = 62;
//
// repositoryItemDateEdit3
//
@@ -902,56 +956,56 @@
this.gvMx1daa008.AppearanceCell.Options.UseFont = true;
this.gvMx1daa008.Caption = "宸ュ崟鎬绘暟";
this.gvMx1daa008.FieldName = "caa012";
- this.gvMx1daa008.MaxWidth = 63;
- this.gvMx1daa008.MinWidth = 63;
+ this.gvMx1daa008.MaxWidth = 62;
+ this.gvMx1daa008.MinWidth = 62;
this.gvMx1daa008.Name = "gvMx1daa008";
this.gvMx1daa008.OptionsColumn.ReadOnly = true;
this.gvMx1daa008.Tag = "query_a.daa008";
this.gvMx1daa008.Visible = true;
this.gvMx1daa008.VisibleIndex = 8;
- this.gvMx1daa008.Width = 63;
+ this.gvMx1daa008.Width = 62;
//
// gvMx1daa006
//
this.gvMx1daa006.AppearanceCell.Options.UseFont = true;
this.gvMx1daa006.Caption = "鍗曚綅";
this.gvMx1daa006.FieldName = "fname";
- this.gvMx1daa006.MaxWidth = 63;
- this.gvMx1daa006.MinWidth = 63;
+ this.gvMx1daa006.MaxWidth = 62;
+ this.gvMx1daa006.MinWidth = 62;
this.gvMx1daa006.Name = "gvMx1daa006";
this.gvMx1daa006.OptionsColumn.ReadOnly = true;
this.gvMx1daa006.Tag = "query_a.daa006";
this.gvMx1daa006.Visible = true;
this.gvMx1daa006.VisibleIndex = 9;
- this.gvMx1daa006.Width = 63;
+ this.gvMx1daa006.Width = 62;
//
// gvMx1daa007
//
this.gvMx1daa007.AppearanceCell.Options.UseFont = true;
this.gvMx1daa007.Caption = "宸叉帓";
this.gvMx1daa007.FieldName = "yp";
- this.gvMx1daa007.MaxWidth = 63;
- this.gvMx1daa007.MinWidth = 63;
+ this.gvMx1daa007.MaxWidth = 62;
+ this.gvMx1daa007.MinWidth = 62;
this.gvMx1daa007.Name = "gvMx1daa007";
this.gvMx1daa007.OptionsColumn.ReadOnly = true;
this.gvMx1daa007.Tag = "query_a.daa007";
this.gvMx1daa007.Visible = true;
this.gvMx1daa007.VisibleIndex = 10;
- this.gvMx1daa007.Width = 63;
+ this.gvMx1daa007.Width = 62;
//
// gvMx1daa009
//
this.gvMx1daa009.AppearanceCell.Options.UseFont = true;
this.gvMx1daa009.Caption = "鏈帓";
this.gvMx1daa009.FieldName = "wp";
- this.gvMx1daa009.MaxWidth = 63;
- this.gvMx1daa009.MinWidth = 63;
+ this.gvMx1daa009.MaxWidth = 62;
+ this.gvMx1daa009.MinWidth = 62;
this.gvMx1daa009.Name = "gvMx1daa009";
this.gvMx1daa009.OptionsColumn.ReadOnly = true;
this.gvMx1daa009.Tag = "query_a.daa009";
this.gvMx1daa009.Visible = true;
this.gvMx1daa009.VisibleIndex = 11;
- this.gvMx1daa009.Width = 63;
+ this.gvMx1daa009.Width = 62;
//
// gvMx1daa011
//
@@ -962,7 +1016,7 @@
this.gvMx1daa011.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1daa011.Caption = "鏈鎺掓暟閲�";
this.gvMx1daa011.FieldName = "daa008";
- this.gvMx1daa011.MaxWidth = 63;
+ this.gvMx1daa011.MaxWidth = 62;
this.gvMx1daa011.MinWidth = 74;
this.gvMx1daa011.Name = "gvMx1daa011";
this.gvMx1daa011.Tag = "yz_quantity_0_edit";
@@ -1006,7 +1060,7 @@
this.gvMx1reporttime.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1reporttime.Caption = "澶囨敞";
this.gvMx1reporttime.FieldName = "daa009";
- this.gvMx1reporttime.MinWidth = 63;
+ this.gvMx1reporttime.MinWidth = 62;
this.gvMx1reporttime.Name = "gvMx1reporttime";
this.gvMx1reporttime.Tag = "edit";
this.gvMx1reporttime.Visible = true;
@@ -1018,7 +1072,7 @@
this.gvMx1daa014.AppearanceCell.Options.UseFont = true;
this.gvMx1daa014.Caption = "鎶曟枡鍗曞崟鍙�";
this.gvMx1daa014.FieldName = "daa014";
- this.gvMx1daa014.MinWidth = 63;
+ this.gvMx1daa014.MinWidth = 62;
this.gvMx1daa014.Name = "gvMx1daa014";
this.gvMx1daa014.OptionsColumn.ReadOnly = true;
this.gvMx1daa014.Tag = "query_a.daa014";
@@ -1039,7 +1093,7 @@
this.gvMx1fstatus.AppearanceCell.Options.UseFont = true;
this.gvMx1fstatus.Caption = "闇�姹傚崟鍙�";
this.gvMx1fstatus.FieldName = "caa015";
- this.gvMx1fstatus.MinWidth = 63;
+ this.gvMx1fstatus.MinWidth = 62;
this.gvMx1fstatus.Name = "gvMx1fstatus";
this.gvMx1fstatus.OptionsColumn.ReadOnly = true;
this.gvMx1fstatus.Tag = "query_a.fstatus";
@@ -1114,7 +1168,7 @@
//
this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
this.picCheckBox.Location = new System.Drawing.Point(1280, 68);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.picCheckBox.Name = "picCheckBox";
this.picCheckBox.Size = new System.Drawing.Size(126, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -1126,11 +1180,11 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1410, 833);
+ this.ClientSize = new System.Drawing.Size(1410, 834);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);
this.Name = "Frm_Wompba";
this.Text = "鎵归噺鎺掍骇";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1162,11 +1216,12 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1216,7 +1271,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraEditors.CheckEdit txt_fstatus;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraTab.XtraTabControl tabMx;
@@ -1246,15 +1300,20 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1reporttime;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
+ private DevExpress.XtraEditors.SimpleButton btnCopyXls;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
}
}
\ No newline at end of file
--
Gitblit v1.9.3