From b0046e84b9f95ce07dbbd117758da848ede67546 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 28 七月 2025 08:14:05 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/WOM/ShowGx.cs | 122 ++
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 4
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 338 +-----
DevApp/Gs.DevApp/DevFrm/WOM/ShowGx.resx | 120 ++
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 91 +
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 14
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs | 19
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx | 63 +
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs | 367 +++----
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 144 ++
DevApp/Gs.DevApp/DevFrm/WOM/ShowGx.Designer.cs | 272 +++++
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 1363 +++++++++++++++++----------
13 files changed, 1,885 insertions(+), 1,041 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 60d9e10..fdc7963 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -30,41 +30,42 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition73 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition74 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition75 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition76 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition34 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition35 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition36 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition37 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition38 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition39 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition77 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition78 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition40 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition79 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition80 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition81 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition82 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition83 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition41 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition42 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition84 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition85 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition86 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition87 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition88 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition89 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition43 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition90 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition91 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition92 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition93 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition94 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition95 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition96 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition44 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraGrid.GridLevelNode gridLevelNode1 = new DevExpress.XtraGrid.GridLevelNode();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -108,6 +109,7 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_daa015 = new Gs.DevApp.UserControl.UcLookWorkline();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_daa009 = new DevExpress.XtraEditors.TextEdit();
this.txt_daa013 = new DevExpress.XtraEditors.TextEdit();
@@ -128,14 +130,14 @@
this.txt_daa003 = new DevExpress.XtraEditors.TextEdit();
this.txt_dwName = new DevExpress.XtraEditors.TextEdit();
this.txt_daa004 = new DevExpress.XtraEditors.TextEdit();
- this.txt_daa015 = new DevExpress.XtraEditors.TextEdit();
this.txt_lineNo = new DevExpress.XtraEditors.TextEdit();
this.txt_dptNo = new DevExpress.XtraEditors.TextEdit();
this.txt_isQiTao = new DevExpress.XtraEditors.CheckEdit();
this.txt_daa018 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_daa025 = new DevExpress.XtraEditors.ComboBoxEdit();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -143,22 +145,23 @@
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_daa015label = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem46 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem48 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -191,6 +194,43 @@
this.gvMx1dab020 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab022 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab023 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.xtraTabPage6 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx6 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx6 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn50 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.xtraTabPage7 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx7 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx7 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.xtraTabPage8 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx8 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx8 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx2status = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn56 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx2tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn57 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn58 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn59 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn60 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn61 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn62 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx99 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx99 = new DevExpress.XtraLayout.LayoutControl();
@@ -287,20 +327,6 @@
this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
- this.xtraTabPage6 = new DevExpress.XtraTab.XtraTabPage();
- this.gcMx6 = new DevExpress.XtraGrid.GridControl();
- this.gvMx6 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn50 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -340,14 +366,14 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa004.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dptNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa025.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
@@ -355,27 +381,37 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa015label)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem48)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ this.xtraTabPage6.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx6)).BeginInit();
+ this.xtraTabPage7.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx7)).BeginInit();
+ this.xtraTabPage8.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx8)).BeginInit();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx99)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx99.Panel1)).BeginInit();
@@ -456,9 +492,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
this.xtraTabPage5.SuspendLayout();
- this.xtraTabPage6.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx6)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -1009,11 +1042,12 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1650, 708);
- this.splitMx1.SplitterPosition = 183;
+ this.splitMx1.SplitterPosition = 192;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.txt_daa015);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_daa009);
this.layoutMx1.Controls.Add(this.txt_daa013);
@@ -1034,23 +1068,31 @@
this.layoutMx1.Controls.Add(this.txt_daa003);
this.layoutMx1.Controls.Add(this.txt_dwName);
this.layoutMx1.Controls.Add(this.txt_daa004);
- this.layoutMx1.Controls.Add(this.txt_daa015);
this.layoutMx1.Controls.Add(this.txt_lineNo);
this.layoutMx1.Controls.Add(this.txt_dptNo);
this.layoutMx1.Controls.Add(this.txt_isQiTao);
this.layoutMx1.Controls.Add(this.txt_daa018);
+ this.layoutMx1.Controls.Add(this.txt_daa025);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem29,
- this.layoutControlItem27,
- this.layoutControlItem18});
+ this.layoutControlItem18,
+ this.layoutControlItem41});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(910, 530, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1059, 277, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1650, 183);
+ this.layoutMx1.Size = new System.Drawing.Size(1650, 192);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // txt_daa015
+ //
+ this.txt_daa015.IsReadly = false;
+ this.txt_daa015.Location = new System.Drawing.Point(928, 155);
+ this.txt_daa015.Name = "txt_daa015";
+ this.txt_daa015.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa015.TabIndex = 478;
//
// lbGuid
//
@@ -1063,10 +1105,10 @@
//
// txt_daa009
//
- this.txt_daa009.Location = new System.Drawing.Point(114, 152);
+ this.txt_daa009.Location = new System.Drawing.Point(114, 155);
this.txt_daa009.Name = "txt_daa009";
this.txt_daa009.Properties.Appearance.Options.UseFont = true;
- this.txt_daa009.Size = new System.Drawing.Size(698, 24);
+ this.txt_daa009.Size = new System.Drawing.Size(708, 24);
this.txt_daa009.StyleController = this.layoutMx1;
this.txt_daa009.TabIndex = 240;
this.txt_daa009.Tag = "";
@@ -1086,37 +1128,37 @@
this.txt_daa001.Location = new System.Drawing.Point(114, 12);
this.txt_daa001.Name = "txt_daa001";
this.txt_daa001.Properties.Appearance.Options.UseFont = true;
- this.txt_daa001.Size = new System.Drawing.Size(296, 24);
+ this.txt_daa001.Size = new System.Drawing.Size(301, 24);
this.txt_daa001.StyleController = this.layoutMx1;
this.txt_daa001.TabIndex = 216;
this.txt_daa001.Tag = "readonly";
//
// txt_daa008
//
- this.txt_daa008.Location = new System.Drawing.Point(918, 12);
+ this.txt_daa008.Location = new System.Drawing.Point(928, 12);
this.txt_daa008.Name = "txt_daa008";
this.txt_daa008.Properties.Appearance.Options.UseFont = true;
- this.txt_daa008.Size = new System.Drawing.Size(296, 24);
+ this.txt_daa008.Size = new System.Drawing.Size(301, 24);
this.txt_daa008.StyleController = this.layoutMx1;
this.txt_daa008.TabIndex = 235;
this.txt_daa008.Tag = "readonly";
//
// txt_saleOrderNo
//
- this.txt_saleOrderNo.Location = new System.Drawing.Point(918, 124);
+ this.txt_saleOrderNo.Location = new System.Drawing.Point(928, 126);
this.txt_saleOrderNo.Name = "txt_saleOrderNo";
this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_saleOrderNo.Size = new System.Drawing.Size(296, 24);
+ this.txt_saleOrderNo.Size = new System.Drawing.Size(301, 24);
this.txt_saleOrderNo.StyleController = this.layoutMx1;
this.txt_saleOrderNo.TabIndex = 465;
this.txt_saleOrderNo.Tag = "readonly";
//
// txt_mesStartProd
//
- this.txt_mesStartProd.Location = new System.Drawing.Point(1320, 12);
+ this.txt_mesStartProd.Location = new System.Drawing.Point(1335, 12);
this.txt_mesStartProd.Name = "txt_mesStartProd";
this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
- this.txt_mesStartProd.Size = new System.Drawing.Size(297, 24);
+ this.txt_mesStartProd.Size = new System.Drawing.Size(303, 24);
this.txt_mesStartProd.StyleController = this.layoutMx1;
this.txt_mesStartProd.TabIndex = 336;
this.txt_mesStartProd.Tag = "readonly";
@@ -1126,67 +1168,67 @@
this.txt_daa014.Location = new System.Drawing.Point(114, 40);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Properties.Appearance.Options.UseFont = true;
- this.txt_daa014.Size = new System.Drawing.Size(296, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(301, 24);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 327;
this.txt_daa014.Tag = "readonly";
//
// txt_daa022Remark
//
- this.txt_daa022Remark.Location = new System.Drawing.Point(516, 12);
+ this.txt_daa022Remark.Location = new System.Drawing.Point(521, 12);
this.txt_daa022Remark.Name = "txt_daa022Remark";
this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
- this.txt_daa022Remark.Size = new System.Drawing.Size(296, 24);
+ this.txt_daa022Remark.Size = new System.Drawing.Size(301, 24);
this.txt_daa022Remark.StyleController = this.layoutMx1;
this.txt_daa022Remark.TabIndex = 462;
this.txt_daa022Remark.Tag = "readonly";
//
// txt_daa010
//
- this.txt_daa010.Location = new System.Drawing.Point(918, 40);
+ this.txt_daa010.Location = new System.Drawing.Point(928, 40);
this.txt_daa010.Name = "txt_daa010";
this.txt_daa010.Properties.Appearance.Options.UseFont = true;
- this.txt_daa010.Size = new System.Drawing.Size(296, 24);
+ this.txt_daa010.Size = new System.Drawing.Size(301, 24);
this.txt_daa010.StyleController = this.layoutMx1;
this.txt_daa010.TabIndex = 243;
this.txt_daa010.Tag = "readonly";
//
// txt_mesEndProd
//
- this.txt_mesEndProd.Location = new System.Drawing.Point(1320, 40);
+ this.txt_mesEndProd.Location = new System.Drawing.Point(1335, 40);
this.txt_mesEndProd.Name = "txt_mesEndProd";
this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
- this.txt_mesEndProd.Size = new System.Drawing.Size(297, 24);
+ this.txt_mesEndProd.Size = new System.Drawing.Size(303, 24);
this.txt_mesEndProd.StyleController = this.layoutMx1;
this.txt_mesEndProd.TabIndex = 338;
this.txt_mesEndProd.Tag = "readonly";
//
// txt_daa011
//
- this.txt_daa011.Location = new System.Drawing.Point(918, 68);
+ this.txt_daa011.Location = new System.Drawing.Point(928, 68);
this.txt_daa011.Name = "txt_daa011";
this.txt_daa011.Properties.Appearance.Options.UseFont = true;
- this.txt_daa011.Size = new System.Drawing.Size(296, 24);
+ this.txt_daa011.Size = new System.Drawing.Size(301, 24);
this.txt_daa011.StyleController = this.layoutMx1;
this.txt_daa011.TabIndex = 247;
this.txt_daa011.Tag = "readonly";
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(516, 40);
+ this.txt_dptName.Location = new System.Drawing.Point(521, 40);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
- this.txt_dptName.Size = new System.Drawing.Size(296, 24);
+ this.txt_dptName.Size = new System.Drawing.Size(301, 24);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 258;
this.txt_dptName.Tag = "readonly";
//
// txt_daa016
//
- this.txt_daa016.Location = new System.Drawing.Point(1320, 68);
+ this.txt_daa016.Location = new System.Drawing.Point(1335, 68);
this.txt_daa016.Name = "txt_daa016";
this.txt_daa016.Properties.Appearance.Options.UseFont = true;
- this.txt_daa016.Size = new System.Drawing.Size(297, 24);
+ this.txt_daa016.Size = new System.Drawing.Size(303, 24);
this.txt_daa016.StyleController = this.layoutMx1;
this.txt_daa016.TabIndex = 273;
this.txt_daa016.Tag = "readonly";
@@ -1196,102 +1238,114 @@
this.txt_daa029.Location = new System.Drawing.Point(114, 68);
this.txt_daa029.Name = "txt_daa029";
this.txt_daa029.Properties.Appearance.Options.UseFont = true;
- this.txt_daa029.Size = new System.Drawing.Size(296, 24);
+ this.txt_daa029.Size = new System.Drawing.Size(301, 24);
this.txt_daa029.StyleController = this.layoutMx1;
this.txt_daa029.TabIndex = 217;
this.txt_daa029.Tag = "readonly";
//
// txt_lineName
//
- this.txt_lineName.Location = new System.Drawing.Point(516, 96);
+ this.txt_lineName.Location = new System.Drawing.Point(521, 68);
this.txt_lineName.Name = "txt_lineName";
this.txt_lineName.Properties.Appearance.Options.UseFont = true;
- this.txt_lineName.Size = new System.Drawing.Size(296, 24);
+ this.txt_lineName.Size = new System.Drawing.Size(301, 24);
this.txt_lineName.StyleController = this.layoutMx1;
this.txt_lineName.TabIndex = 267;
this.txt_lineName.Tag = "readonly";
//
// txt_daa017
//
- this.txt_daa017.Location = new System.Drawing.Point(1320, 96);
+ this.txt_daa017.Location = new System.Drawing.Point(1335, 97);
this.txt_daa017.Name = "txt_daa017";
this.txt_daa017.Properties.Appearance.Options.UseFont = true;
- this.txt_daa017.Size = new System.Drawing.Size(297, 24);
+ this.txt_daa017.Size = new System.Drawing.Size(303, 24);
this.txt_daa017.StyleController = this.layoutMx1;
this.txt_daa017.TabIndex = 280;
this.txt_daa017.Tag = "readonly";
//
// txt_daa003
//
- this.txt_daa003.Location = new System.Drawing.Point(114, 96);
+ this.txt_daa003.Location = new System.Drawing.Point(114, 97);
this.txt_daa003.Name = "txt_daa003";
this.txt_daa003.Properties.Appearance.Options.UseFont = true;
- this.txt_daa003.Size = new System.Drawing.Size(296, 24);
+ this.txt_daa003.Size = new System.Drawing.Size(301, 24);
this.txt_daa003.StyleController = this.layoutMx1;
this.txt_daa003.TabIndex = 219;
this.txt_daa003.Tag = "readonly";
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(918, 96);
+ this.txt_dwName.Location = new System.Drawing.Point(928, 97);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
- this.txt_dwName.Size = new System.Drawing.Size(296, 24);
+ this.txt_dwName.Size = new System.Drawing.Size(301, 24);
this.txt_dwName.StyleController = this.layoutMx1;
this.txt_dwName.TabIndex = 226;
this.txt_dwName.Tag = "readonly";
//
// txt_daa004
//
- this.txt_daa004.Location = new System.Drawing.Point(114, 124);
+ this.txt_daa004.Location = new System.Drawing.Point(114, 126);
this.txt_daa004.Name = "txt_daa004";
this.txt_daa004.Properties.Appearance.Options.UseFont = true;
- this.txt_daa004.Size = new System.Drawing.Size(296, 24);
+ this.txt_daa004.Size = new System.Drawing.Size(301, 24);
this.txt_daa004.StyleController = this.layoutMx1;
this.txt_daa004.TabIndex = 222;
this.txt_daa004.Tag = "readonly";
//
- // txt_daa015
- //
- this.txt_daa015.Location = new System.Drawing.Point(420, 124);
- this.txt_daa015.Name = "txt_daa015";
- this.txt_daa015.Size = new System.Drawing.Size(200, 24);
- this.txt_daa015.StyleController = this.layoutMx1;
- this.txt_daa015.TabIndex = 473;
- //
// txt_lineNo
//
- this.txt_lineNo.Location = new System.Drawing.Point(516, 124);
+ this.txt_lineNo.Location = new System.Drawing.Point(521, 97);
this.txt_lineNo.Name = "txt_lineNo";
- this.txt_lineNo.Size = new System.Drawing.Size(296, 24);
+ this.txt_lineNo.Size = new System.Drawing.Size(301, 24);
this.txt_lineNo.StyleController = this.layoutMx1;
this.txt_lineNo.TabIndex = 474;
+ this.txt_lineNo.Tag = "readonly";
//
// txt_dptNo
//
- this.txt_dptNo.Location = new System.Drawing.Point(516, 68);
+ this.txt_dptNo.Location = new System.Drawing.Point(521, 68);
this.txt_dptNo.Name = "txt_dptNo";
- this.txt_dptNo.Size = new System.Drawing.Size(296, 24);
+ this.txt_dptNo.Size = new System.Drawing.Size(301, 24);
this.txt_dptNo.StyleController = this.layoutMx1;
this.txt_dptNo.TabIndex = 475;
+ this.txt_dptNo.Tag = "readonly";
//
// txt_isQiTao
//
- this.txt_isQiTao.Location = new System.Drawing.Point(1218, 124);
+ this.txt_isQiTao.Location = new System.Drawing.Point(1233, 126);
this.txt_isQiTao.Name = "txt_isQiTao";
this.txt_isQiTao.Properties.Caption = "澶囨枡榻愬";
- this.txt_isQiTao.Size = new System.Drawing.Size(399, 24);
+ this.txt_isQiTao.Size = new System.Drawing.Size(405, 24);
this.txt_isQiTao.StyleController = this.layoutMx1;
this.txt_isQiTao.TabIndex = 476;
//
// txt_daa018
//
- this.txt_daa018.Location = new System.Drawing.Point(918, 152);
+ this.txt_daa018.Location = new System.Drawing.Point(521, 126);
this.txt_daa018.Name = "txt_daa018";
- this.txt_daa018.Size = new System.Drawing.Size(296, 24);
+ this.txt_daa018.Size = new System.Drawing.Size(301, 24);
this.txt_daa018.StyleController = this.layoutMx1;
this.txt_daa018.TabIndex = 477;
this.txt_daa018.Tag = "readonly";
+ //
+ // txt_daa025
+ //
+ this.txt_daa025.Location = new System.Drawing.Point(1335, 155);
+ this.txt_daa025.Name = "txt_daa025";
+ this.txt_daa025.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_daa025.Properties.Items.AddRange(new object[] {
+ "F-閲忎骇",
+ "S-璇曚骇",
+ "C-鎷嗘満杩斿伐",
+ "W-缁翠慨杩斿伐锛�",
+ "G-杩斿伐",
+ "O-澶栧彂"});
+ this.txt_daa025.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_daa025.Size = new System.Drawing.Size(303, 24);
+ this.txt_daa025.StyleController = this.layoutMx1;
+ this.txt_daa025.TabIndex = 479;
//
// layoutControlItem29
//
@@ -1305,17 +1359,6 @@
this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem29.TextVisible = false;
//
- // layoutControlItem27
- //
- this.layoutControlItem27.Control = this.txt_daa015;
- this.layoutControlItem27.Location = new System.Drawing.Point(306, 112);
- this.layoutControlItem27.Name = "layoutControlItem27";
- this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem27.Size = new System.Drawing.Size(306, 28);
- this.layoutControlItem27.Text = "鐢熶骇绾垮埆ID";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
- //
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_daa013;
@@ -1328,6 +1371,17 @@
this.layoutControlItem18.Text = "杞﹂棿ID";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
+ // layoutControlItem41
+ //
+ this.layoutControlItem41.Control = this.txt_dptNo;
+ this.layoutControlItem41.Location = new System.Drawing.Point(407, 56);
+ this.layoutControlItem41.Name = "layoutControlItem41";
+ this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem41.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem41.Text = "杞﹂棿缂栫爜";
+ this.layoutControlItem41.TextSize = new System.Drawing.Size(90, 18);
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -1339,57 +1393,58 @@
this.layoutControlItem7,
this.layoutControlItem11,
this.layoutControlItem6,
- this.layoutControlItem14,
this.layoutControlItem20,
- this.layoutControlItem41,
this.layoutControlItem15,
this.layoutControlItem4,
this.layoutControlItem8,
this.layoutControlItem12,
this.layoutControlItem16,
- this.layoutControlItem40,
this.layoutControlItem9,
this.layoutControlItem13,
this.layoutControlItem19,
this.layoutControlItem17,
this.layoutControlItem28,
+ this.txt_daa015label,
+ this.layoutControlItem14,
this.layoutControlItem46,
- this.layoutControlItem48});
+ this.layoutControlItem48,
+ this.layoutControlItem40,
+ this.layoutControlItem27});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition73.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition73.Width = 100D;
- columnDefinition74.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition74.Width = 100D;
- columnDefinition75.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition75.Width = 100D;
- columnDefinition76.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition76.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition73,
- columnDefinition74,
- columnDefinition75,
- columnDefinition76});
- rowDefinition34.Height = 100D;
- rowDefinition34.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition35.Height = 100D;
- rowDefinition35.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition36.Height = 100D;
- rowDefinition36.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition37.Height = 100D;
- rowDefinition37.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition38.Height = 100D;
- rowDefinition38.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition39.Height = 100D;
- rowDefinition39.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition34,
- rowDefinition35,
- rowDefinition36,
- rowDefinition37,
- rowDefinition38,
- rowDefinition39});
- this.Root.Size = new System.Drawing.Size(1629, 188);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
+ this.Root.Size = new System.Drawing.Size(1650, 192);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1397,17 +1452,17 @@
this.layoutControlItem1.Control = this.txt_daa001;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(402, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(407, 28);
this.layoutControlItem1.Text = "宸ュ崟鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_daa008;
- this.layoutControlItem3.Location = new System.Drawing.Point(804, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(814, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(402, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(407, 28);
this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1417,83 +1472,61 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(402, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(407, 28);
this.layoutControlItem5.Text = "鎶曟枡鍗曞彿";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_daa010;
- this.layoutControlItem7.Location = new System.Drawing.Point(804, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(814, 28);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(402, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(407, 28);
this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_daa011;
- this.layoutControlItem11.Location = new System.Drawing.Point(804, 56);
+ this.layoutControlItem11.Location = new System.Drawing.Point(814, 56);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(402, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(407, 29);
this.layoutControlItem11.Text = "宸茬敓浜ч噺";
this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_daa022Remark;
- this.layoutControlItem6.Location = new System.Drawing.Point(402, 0);
+ this.layoutControlItem6.Location = new System.Drawing.Point(407, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(402, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(407, 28);
this.layoutControlItem6.Text = "閫氱煡澶囨枡";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_lineName;
- this.layoutControlItem14.Location = new System.Drawing.Point(402, 84);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(402, 28);
- this.layoutControlItem14.Text = "鐢熶骇绾垮埆";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_dptName;
- this.layoutControlItem20.Location = new System.Drawing.Point(402, 28);
+ this.layoutControlItem20.Location = new System.Drawing.Point(407, 28);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem20.Size = new System.Drawing.Size(402, 28);
+ this.layoutControlItem20.Size = new System.Drawing.Size(407, 28);
this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem41
- //
- this.layoutControlItem41.Control = this.txt_dptNo;
- this.layoutControlItem41.Location = new System.Drawing.Point(402, 56);
- this.layoutControlItem41.Name = "layoutControlItem41";
- this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem41.Size = new System.Drawing.Size(402, 28);
- this.layoutControlItem41.Text = "杞﹂棿缂栫爜";
- this.layoutControlItem41.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_dwName;
- this.layoutControlItem15.Location = new System.Drawing.Point(804, 84);
+ this.layoutControlItem15.Location = new System.Drawing.Point(814, 85);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(402, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(407, 29);
this.layoutControlItem15.Text = "鍗曚綅";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1501,65 +1534,54 @@
//
this.layoutControlItem4.Control = this.txt_mesStartProd;
this.layoutControlItem4.CustomizationFormText = "Mes棰勮寮�宸�";
- this.layoutControlItem4.Location = new System.Drawing.Point(1206, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(1221, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(403, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(409, 28);
this.layoutControlItem4.Text = "Mes棰勮寮�宸�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_mesEndProd;
- this.layoutControlItem8.Location = new System.Drawing.Point(1206, 28);
+ this.layoutControlItem8.Location = new System.Drawing.Point(1221, 28);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(403, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(409, 28);
this.layoutControlItem8.Text = "Mes棰勮瀹屽伐";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_daa016;
- this.layoutControlItem12.Location = new System.Drawing.Point(1206, 56);
+ this.layoutControlItem12.Location = new System.Drawing.Point(1221, 56);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(403, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(409, 29);
this.layoutControlItem12.Text = "瀹為檯寮�宸ユ椂闂�";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_daa017;
- this.layoutControlItem16.Location = new System.Drawing.Point(1206, 84);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1221, 85);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(403, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(409, 29);
this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem40
- //
- this.layoutControlItem40.Control = this.txt_lineNo;
- this.layoutControlItem40.Location = new System.Drawing.Point(402, 112);
- this.layoutControlItem40.Name = "layoutControlItem40";
- this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem40.Size = new System.Drawing.Size(402, 28);
- this.layoutControlItem40.Text = "绾垮埆缂栫爜";
- this.layoutControlItem40.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_saleOrderNo;
- this.layoutControlItem9.Location = new System.Drawing.Point(804, 112);
+ this.layoutControlItem9.Location = new System.Drawing.Point(814, 114);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem9.Size = new System.Drawing.Size(402, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(407, 29);
this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1569,62 +1591,107 @@
this.layoutControlItem13.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(402, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(407, 29);
this.layoutControlItem13.Text = "浜у搧缂栫爜";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_daa003;
- this.layoutControlItem19.Location = new System.Drawing.Point(0, 84);
+ this.layoutControlItem19.Location = new System.Drawing.Point(0, 85);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(402, 28);
+ this.layoutControlItem19.Size = new System.Drawing.Size(407, 29);
this.layoutControlItem19.Text = "浜у搧鍚嶇О";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_daa004;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 112);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 114);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(402, 28);
+ this.layoutControlItem17.Size = new System.Drawing.Size(407, 29);
this.layoutControlItem17.Text = "浜у搧瑙勬牸";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_daa009;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 140);
+ this.layoutControlItem28.Location = new System.Drawing.Point(0, 143);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem28.Size = new System.Drawing.Size(804, 28);
+ this.layoutControlItem28.Size = new System.Drawing.Size(814, 29);
this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // txt_daa015label
+ //
+ this.txt_daa015label.Control = this.txt_daa015;
+ this.txt_daa015label.Location = new System.Drawing.Point(814, 143);
+ this.txt_daa015label.Name = "txt_daa015label";
+ this.txt_daa015label.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.txt_daa015label.OptionsTableLayoutItem.RowIndex = 5;
+ this.txt_daa015label.Size = new System.Drawing.Size(407, 29);
+ this.txt_daa015label.Text = "绾夸綋鍙樻洿";
+ this.txt_daa015label.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_lineName;
+ this.layoutControlItem14.Location = new System.Drawing.Point(407, 56);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem14.Text = "绾垮埆鍚嶇О";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem46
//
this.layoutControlItem46.Control = this.txt_isQiTao;
- this.layoutControlItem46.Location = new System.Drawing.Point(1206, 112);
+ this.layoutControlItem46.Location = new System.Drawing.Point(1221, 114);
this.layoutControlItem46.Name = "layoutControlItem46";
this.layoutControlItem46.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem46.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem46.Size = new System.Drawing.Size(403, 28);
+ this.layoutControlItem46.Size = new System.Drawing.Size(409, 29);
+ this.layoutControlItem46.Text = "澶囨枡榻愭稕";
this.layoutControlItem46.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem46.TextVisible = false;
//
// layoutControlItem48
//
this.layoutControlItem48.Control = this.txt_daa018;
- this.layoutControlItem48.Location = new System.Drawing.Point(804, 140);
+ this.layoutControlItem48.Location = new System.Drawing.Point(407, 114);
this.layoutControlItem48.Name = "layoutControlItem48";
- this.layoutControlItem48.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem48.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem48.Size = new System.Drawing.Size(402, 28);
+ this.layoutControlItem48.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem48.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem48.Size = new System.Drawing.Size(407, 29);
this.layoutControlItem48.Text = "宸ュ崟鐘舵��";
this.layoutControlItem48.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem40
+ //
+ this.layoutControlItem40.Control = this.txt_lineNo;
+ this.layoutControlItem40.Location = new System.Drawing.Point(407, 85);
+ this.layoutControlItem40.Name = "layoutControlItem40";
+ this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem40.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem40.Text = "绾垮埆缂栫爜";
+ this.layoutControlItem40.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.txt_daa025;
+ this.layoutControlItem27.Location = new System.Drawing.Point(1221, 143);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem27.Size = new System.Drawing.Size(409, 29);
+ this.layoutControlItem27.Text = "鐢熶骇绫诲瀷";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -1632,11 +1699,13 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1650, 513);
+ this.tabMx.Size = new System.Drawing.Size(1650, 504);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
this.xtraTabPage6,
+ this.xtraTabPage7,
+ this.xtraTabPage8,
this.tabMxPage2,
this.xtraTabPage3,
this.xtraTabPage4,
@@ -1648,7 +1717,7 @@
this.tabMxPage1.Appearance.Header.Options.UseForeColor = true;
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1648, 481);
+ this.tabMxPage1.Size = new System.Drawing.Size(1648, 472);
this.tabMxPage1.Text = "澶囨枡鍗曡韩";
//
// gcMx1
@@ -1657,7 +1726,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1648, 481);
+ this.gcMx1.Size = new System.Drawing.Size(1648, 472);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -2008,11 +2077,444 @@
this.gvMx1dab023.VisibleIndex = 14;
this.gvMx1dab023.Width = 94;
//
+ // xtraTabPage6
+ //
+ this.xtraTabPage6.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
+ this.xtraTabPage6.Appearance.Header.Options.UseForeColor = true;
+ this.xtraTabPage6.Controls.Add(this.gcMx6);
+ this.xtraTabPage6.Name = "xtraTabPage6";
+ this.xtraTabPage6.Size = new System.Drawing.Size(1648, 472);
+ this.xtraTabPage6.Text = "澶囨枡鏄庣粏";
+ //
+ // gcMx6
+ //
+ this.gcMx6.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx6.Location = new System.Drawing.Point(0, 0);
+ this.gcMx6.MainView = this.gvMx6;
+ this.gcMx6.Name = "gcMx6";
+ this.gcMx6.Size = new System.Drawing.Size(1648, 472);
+ this.gcMx6.TabIndex = 1;
+ this.gcMx6.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx6});
+ //
+ // gvMx6
+ //
+ this.gvMx6.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMx6.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx6.ColumnPanelRowHeight = 50;
+ this.gvMx6.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn2,
+ this.gridColumn9,
+ this.gridColumn11,
+ this.gridColumn20,
+ this.gridColumn26,
+ this.gridColumn28,
+ this.gridColumn29,
+ this.gridColumn49,
+ this.gridColumn8,
+ this.gridColumn50,
+ this.gridColumn51});
+ this.gvMx6.GridControl = this.gcMx6;
+ this.gvMx6.Name = "gvMx6";
+ this.gvMx6.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx6.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx6.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "gvMx1Guid";
+ this.gridColumn2.FieldName = "guid";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.AppearanceCell.Options.UseFont = true;
+ this.gridColumn9.Caption = "宸ュ崟鍗曞彿";
+ this.gridColumn9.FieldName = "daa001";
+ this.gridColumn9.MinWidth = 50;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Tag = "query_a.dab001";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 0;
+ this.gridColumn9.Width = 94;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.AppearanceCell.Options.UseFont = true;
+ this.gridColumn11.Caption = "鏉愭枡缂栫爜";
+ this.gridColumn11.FieldName = "itemNo";
+ this.gridColumn11.MinWidth = 50;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Tag = "query_a.dab003";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 1;
+ this.gridColumn11.Width = 94;
+ //
+ // gridColumn20
+ //
+ this.gridColumn20.AppearanceCell.Options.UseFont = true;
+ this.gridColumn20.Caption = "鏉愭枡鍚嶇О";
+ this.gridColumn20.FieldName = "itemName";
+ this.gridColumn20.MinWidth = 50;
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Tag = "query_a.dab004";
+ this.gridColumn20.Visible = true;
+ this.gridColumn20.VisibleIndex = 2;
+ this.gridColumn20.Width = 94;
+ //
+ // gridColumn26
+ //
+ this.gridColumn26.AppearanceCell.Options.UseFont = true;
+ this.gridColumn26.Caption = "鏉愭枡瑙勬牸";
+ this.gridColumn26.FieldName = "itemModel";
+ this.gridColumn26.MinWidth = 50;
+ this.gridColumn26.Name = "gridColumn26";
+ this.gridColumn26.Tag = "query_a.dab005";
+ this.gridColumn26.Visible = true;
+ this.gridColumn26.VisibleIndex = 3;
+ this.gridColumn26.Width = 94;
+ //
+ // gridColumn28
+ //
+ this.gridColumn28.Caption = "鐗╂枡鏉＄爜";
+ this.gridColumn28.FieldName = "itemBarcode";
+ this.gridColumn28.MinWidth = 25;
+ this.gridColumn28.Name = "gridColumn28";
+ this.gridColumn28.Visible = true;
+ this.gridColumn28.VisibleIndex = 4;
+ this.gridColumn28.Width = 94;
+ //
+ // gridColumn29
+ //
+ this.gridColumn29.Caption = "鏉＄爜鏁伴噺";
+ this.gridColumn29.FieldName = "quantity";
+ this.gridColumn29.MinWidth = 25;
+ this.gridColumn29.Name = "gridColumn29";
+ this.gridColumn29.Visible = true;
+ this.gridColumn29.VisibleIndex = 5;
+ this.gridColumn29.Width = 94;
+ //
+ // gridColumn49
+ //
+ this.gridColumn49.Caption = "澶囨枡璇︽儏";
+ this.gridColumn49.FieldName = "blDetail";
+ this.gridColumn49.MinWidth = 25;
+ this.gridColumn49.Name = "gridColumn49";
+ this.gridColumn49.Visible = true;
+ this.gridColumn49.VisibleIndex = 6;
+ this.gridColumn49.Width = 94;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鏀舵枡璇︽儏";
+ this.gridColumn8.FieldName = "slDetail";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 7;
+ this.gridColumn8.Width = 94;
+ //
+ // gridColumn50
+ //
+ this.gridColumn50.Caption = "鎶曟枡璇︽儏";
+ this.gridColumn50.FieldName = "tlDetail";
+ this.gridColumn50.MinWidth = 25;
+ this.gridColumn50.Name = "gridColumn50";
+ this.gridColumn50.Visible = true;
+ this.gridColumn50.VisibleIndex = 8;
+ this.gridColumn50.Width = 94;
+ //
+ // gridColumn51
+ //
+ this.gridColumn51.Caption = "閫�鏂欒鎯�";
+ this.gridColumn51.FieldName = "tuiDetail";
+ this.gridColumn51.MinWidth = 25;
+ this.gridColumn51.Name = "gridColumn51";
+ this.gridColumn51.Visible = true;
+ this.gridColumn51.VisibleIndex = 9;
+ this.gridColumn51.Width = 94;
+ //
+ // xtraTabPage7
+ //
+ this.xtraTabPage7.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
+ this.xtraTabPage7.Appearance.Header.Options.UseForeColor = true;
+ this.xtraTabPage7.Controls.Add(this.gcMx7);
+ this.xtraTabPage7.Name = "xtraTabPage7";
+ this.xtraTabPage7.Size = new System.Drawing.Size(1648, 472);
+ this.xtraTabPage7.Text = "宸ュ簭鏄庣粏";
+ //
+ // gcMx7
+ //
+ this.gcMx7.Dock = System.Windows.Forms.DockStyle.Fill;
+ gridLevelNode1.RelationName = "Level1";
+ this.gcMx7.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {
+ gridLevelNode1});
+ this.gcMx7.Location = new System.Drawing.Point(0, 0);
+ this.gcMx7.MainView = this.gvMx7;
+ this.gcMx7.Name = "gcMx7";
+ this.gcMx7.Size = new System.Drawing.Size(1648, 472);
+ this.gcMx7.TabIndex = 1;
+ this.gcMx7.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx7});
+ //
+ // gvMx7
+ //
+ this.gvMx7.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMx7.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx7.ColumnPanelRowHeight = 50;
+ this.gvMx7.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gvMx1daa002,
+ this.gvMx1daa010,
+ this.gvMx1daa004});
+ this.gvMx7.GridControl = this.gcMx7;
+ this.gvMx7.Name = "gvMx7";
+ this.gvMx7.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+ this.gvMx7.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx7.OptionsView.ShowGroupPanel = false;
+ //
+ // gvMx1daa002
+ //
+ this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa002.Caption = "搴忓彿";
+ this.gvMx1daa002.FieldName = "fSeq";
+ this.gvMx1daa002.MinWidth = 50;
+ this.gvMx1daa002.Name = "gvMx1daa002";
+ this.gvMx1daa002.OptionsColumn.ReadOnly = true;
+ this.gvMx1daa002.Tag = "edit";
+ this.gvMx1daa002.Visible = true;
+ this.gvMx1daa002.VisibleIndex = 0;
+ this.gvMx1daa002.Width = 54;
+ //
+ // gvMx1daa010
+ //
+ this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa010.Caption = "宸ュ簭";
+ this.gvMx1daa010.FieldName = "processNo";
+ this.gvMx1daa010.MinWidth = 50;
+ 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 = 129;
+ //
+ // gvMx1daa004
+ //
+ this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa004.Caption = "涓婂伐搴�";
+ this.gvMx1daa004.FieldName = "frontProcessNo";
+ this.gvMx1daa004.MinWidth = 150;
+ this.gvMx1daa004.Name = "gvMx1daa004";
+ this.gvMx1daa004.OptionsColumn.ReadOnly = true;
+ this.gvMx1daa004.Tag = "edit";
+ this.gvMx1daa004.Visible = true;
+ this.gvMx1daa004.VisibleIndex = 2;
+ this.gvMx1daa004.Width = 150;
+ //
+ // xtraTabPage8
+ //
+ this.xtraTabPage8.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
+ this.xtraTabPage8.Appearance.Header.Options.UseForeColor = true;
+ this.xtraTabPage8.Controls.Add(this.gcMx8);
+ this.xtraTabPage8.Name = "xtraTabPage8";
+ this.xtraTabPage8.Size = new System.Drawing.Size(1648, 472);
+ this.xtraTabPage8.Text = "鏁版嵁閲囬泦鏄庣粏";
+ //
+ // gcMx8
+ //
+ this.gcMx8.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx8.Location = new System.Drawing.Point(0, 0);
+ this.gcMx8.MainView = this.gvMx8;
+ this.gcMx8.Name = "gcMx8";
+ this.gcMx8.Size = new System.Drawing.Size(1648, 472);
+ this.gcMx8.TabIndex = 1;
+ this.gcMx8.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx8});
+ //
+ // gvMx8
+ //
+ this.gvMx8.Appearance.Row.Options.UseFont = true;
+ this.gvMx8.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn53,
+ this.gvMx2status,
+ this.gvMx2pbillNo,
+ this.gvMx2itemNo,
+ this.gridColumn54,
+ this.gridColumn55,
+ this.gridColumn56,
+ this.gvMx2tlQty,
+ this.gridColumn57,
+ this.gridColumn58,
+ this.gridColumn59,
+ this.gridColumn60,
+ this.gridColumn61,
+ this.gridColumn62});
+ this.gvMx8.GridControl = this.gcMx8;
+ this.gvMx8.Name = "gvMx8";
+ this.gvMx8.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+ this.gvMx8.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx8.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn53
+ //
+ this.gridColumn53.Caption = "guid";
+ this.gridColumn53.FieldName = "guid";
+ this.gridColumn53.MinWidth = 25;
+ this.gridColumn53.Name = "gridColumn53";
+ this.gridColumn53.OptionsColumn.ReadOnly = true;
+ this.gridColumn53.Width = 94;
+ //
+ // gvMx2status
+ //
+ this.gvMx2status.AppearanceCell.Options.UseFont = true;
+ this.gvMx2status.Caption = "宸ュ崟缂栧彿";
+ this.gvMx2status.FieldName = "gdbh";
+ this.gvMx2status.MinWidth = 10;
+ this.gvMx2status.Name = "gvMx2status";
+ this.gvMx2status.OptionsColumn.ReadOnly = true;
+ this.gvMx2status.Tag = "query_a.status";
+ this.gvMx2status.Visible = true;
+ this.gvMx2status.VisibleIndex = 0;
+ this.gvMx2status.Width = 50;
+ //
+ // gvMx2pbillNo
+ //
+ this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
+ this.gvMx2pbillNo.Caption = "杩芥函鐮�";
+ this.gvMx2pbillNo.FieldName = "barCode";
+ this.gvMx2pbillNo.Name = "gvMx2pbillNo";
+ this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
+ this.gvMx2pbillNo.Tag = "query_a.pbill_no";
+ this.gvMx2pbillNo.Visible = true;
+ this.gvMx2pbillNo.VisibleIndex = 1;
+ this.gvMx2pbillNo.Width = 94;
+ //
+ // gvMx2itemNo
+ //
+ this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
+ this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
+ this.gvMx2itemNo.FieldName = "itemNo";
+ this.gvMx2itemNo.Name = "gvMx2itemNo";
+ this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
+ this.gvMx2itemNo.Tag = "query_a.item_no";
+ this.gvMx2itemNo.Visible = true;
+ this.gvMx2itemNo.VisibleIndex = 2;
+ this.gvMx2itemNo.Width = 94;
+ //
+ // gridColumn54
+ //
+ this.gridColumn54.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn54.FieldName = "itemName";
+ this.gridColumn54.Name = "gridColumn54";
+ this.gridColumn54.OptionsColumn.ReadOnly = true;
+ this.gridColumn54.Visible = true;
+ this.gridColumn54.VisibleIndex = 3;
+ this.gridColumn54.Width = 94;
+ //
+ // gridColumn55
+ //
+ this.gridColumn55.Caption = "瑙勬牸鍨嬪彿";
+ this.gridColumn55.FieldName = "itemModel";
+ this.gridColumn55.Name = "gridColumn55";
+ this.gridColumn55.OptionsColumn.ReadOnly = true;
+ this.gridColumn55.Visible = true;
+ this.gridColumn55.VisibleIndex = 4;
+ this.gridColumn55.Width = 94;
+ //
+ // gridColumn56
+ //
+ this.gridColumn56.Caption = "鏁伴噺";
+ this.gridColumn56.FieldName = "quantity";
+ this.gridColumn56.MinWidth = 25;
+ this.gridColumn56.Name = "gridColumn56";
+ this.gridColumn56.OptionsColumn.ReadOnly = true;
+ this.gridColumn56.Visible = true;
+ this.gridColumn56.VisibleIndex = 6;
+ this.gridColumn56.Width = 94;
+ //
+ // gvMx2tlQty
+ //
+ this.gvMx2tlQty.AppearanceCell.Options.UseFont = true;
+ this.gvMx2tlQty.Caption = "鍗曚綅";
+ this.gvMx2tlQty.FieldName = "dwName";
+ this.gvMx2tlQty.Name = "gvMx2tlQty";
+ this.gvMx2tlQty.OptionsColumn.ReadOnly = true;
+ this.gvMx2tlQty.Tag = "query_a.tl_qty";
+ this.gvMx2tlQty.Visible = true;
+ this.gvMx2tlQty.VisibleIndex = 5;
+ this.gvMx2tlQty.Width = 94;
+ //
+ // gridColumn57
+ //
+ this.gridColumn57.Caption = "宸ュ簭";
+ this.gridColumn57.FieldName = "processNo";
+ this.gridColumn57.MinWidth = 25;
+ this.gridColumn57.Name = "gridColumn57";
+ this.gridColumn57.OptionsColumn.ReadOnly = true;
+ this.gridColumn57.Visible = true;
+ this.gridColumn57.VisibleIndex = 7;
+ this.gridColumn57.Width = 94;
+ //
+ // gridColumn58
+ //
+ this.gridColumn58.Caption = "涓嶈壇鎻忚堪";
+ this.gridColumn58.FieldName = "badDescription";
+ this.gridColumn58.MinWidth = 25;
+ this.gridColumn58.Name = "gridColumn58";
+ this.gridColumn58.OptionsColumn.ReadOnly = true;
+ this.gridColumn58.Width = 94;
+ //
+ // gridColumn59
+ //
+ this.gridColumn59.Caption = "缁撴灉";
+ this.gridColumn59.FieldName = "checkResult";
+ this.gridColumn59.MinWidth = 25;
+ this.gridColumn59.Name = "gridColumn59";
+ this.gridColumn59.OptionsColumn.ReadOnly = true;
+ this.gridColumn59.Visible = true;
+ this.gridColumn59.VisibleIndex = 8;
+ this.gridColumn59.Width = 94;
+ //
+ // gridColumn60
+ //
+ this.gridColumn60.Caption = "涓婃姤浜�";
+ this.gridColumn60.FieldName = "createBy";
+ this.gridColumn60.MinWidth = 25;
+ this.gridColumn60.Name = "gridColumn60";
+ this.gridColumn60.OptionsColumn.ReadOnly = true;
+ this.gridColumn60.Visible = true;
+ this.gridColumn60.VisibleIndex = 9;
+ this.gridColumn60.Width = 94;
+ //
+ // gridColumn61
+ //
+ this.gridColumn61.Caption = "鏈�鍚庝笂鎶ユ椂闂�";
+ this.gridColumn61.FieldName = "createDate";
+ this.gridColumn61.MinWidth = 25;
+ this.gridColumn61.Name = "gridColumn61";
+ this.gridColumn61.OptionsColumn.ReadOnly = true;
+ this.gridColumn61.Visible = true;
+ this.gridColumn61.VisibleIndex = 10;
+ this.gridColumn61.Width = 94;
+ //
+ // gridColumn62
+ //
+ this.gridColumn62.Caption = "鏁版嵁鐘舵��";
+ this.gridColumn62.FieldName = "barCodeStatusTxt";
+ this.gridColumn62.MinWidth = 25;
+ this.gridColumn62.Name = "gridColumn62";
+ this.gridColumn62.OptionsColumn.ReadOnly = true;
+ this.gridColumn62.Visible = true;
+ this.gridColumn62.VisibleIndex = 11;
+ this.gridColumn62.Width = 94;
+ //
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.splitMx99);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1648, 481);
+ this.tabMxPage2.Size = new System.Drawing.Size(1648, 472);
this.tabMxPage2.Text = "鎵樻澘鐮佹槑缁�";
//
// splitMx99
@@ -2032,7 +2534,7 @@
this.splitMx99.Panel2.Controls.Add(this.gcMx2);
this.splitMx99.Panel2.Text = "Panel2";
this.splitMx99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx99.Size = new System.Drawing.Size(1648, 481);
+ this.splitMx99.Size = new System.Drawing.Size(1648, 472);
this.splitMx99.SplitterPosition = 83;
this.splitMx99.TabIndex = 2;
//
@@ -2094,17 +2596,17 @@
this.layoutControlItem39});
this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup3.Name = "Root";
- columnDefinition77.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition77.Width = 100D;
- columnDefinition78.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition78.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition77,
- columnDefinition78});
- rowDefinition40.Height = 100D;
- rowDefinition40.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6});
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition40});
+ rowDefinition7});
this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28);
this.layoutControlGroup3.TextVisible = false;
@@ -2222,29 +2724,29 @@
this.layoutControlItem36});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition79.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition79.Width = 100D;
- columnDefinition80.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition80.Width = 100D;
- columnDefinition81.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition81.Width = 100D;
- columnDefinition82.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition82.Width = 100D;
- columnDefinition83.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition83.Width = 328D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ columnDefinition11.Width = 328D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition79,
- columnDefinition80,
- columnDefinition81,
- columnDefinition82,
- columnDefinition83});
- rowDefinition41.Height = 100D;
- rowDefinition41.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition42.Height = 100D;
- rowDefinition42.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7,
+ columnDefinition8,
+ columnDefinition9,
+ columnDefinition10,
+ columnDefinition11});
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition41,
- rowDefinition42});
+ rowDefinition8,
+ rowDefinition9});
this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
this.layoutControlGroup1.TextVisible = false;
//
@@ -2350,7 +2852,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1648, 386);
+ this.gcMx2.Size = new System.Drawing.Size(1648, 377);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2531,7 +3033,7 @@
//
this.xtraTabPage3.Controls.Add(this.splitMx98);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1648, 481);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1648, 472);
this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�";
//
// splitMx98
@@ -2551,7 +3053,7 @@
this.splitMx98.Panel2.Controls.Add(this.gcMx3);
this.splitMx98.Panel2.Text = "Panel2";
this.splitMx98.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx98.Size = new System.Drawing.Size(1648, 481);
+ this.splitMx98.Size = new System.Drawing.Size(1648, 472);
this.splitMx98.SplitterPosition = 52;
this.splitMx98.TabIndex = 2;
//
@@ -2639,29 +3141,29 @@
this.layoutControlItem37});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "Root";
- columnDefinition84.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition84.Width = 100D;
- columnDefinition85.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition85.Width = 100D;
- columnDefinition86.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition86.Width = 100D;
- columnDefinition87.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition87.Width = 100D;
- columnDefinition88.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition88.Width = 100D;
- columnDefinition89.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition89.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
+ columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition13.Width = 100D;
+ columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition14.Width = 100D;
+ columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15.Width = 100D;
+ columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition16.Width = 100D;
+ columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition17.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition84,
- columnDefinition85,
- columnDefinition86,
- columnDefinition87,
- columnDefinition88,
- columnDefinition89});
- rowDefinition43.Height = 100D;
- rowDefinition43.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12,
+ columnDefinition13,
+ columnDefinition14,
+ columnDefinition15,
+ columnDefinition16,
+ columnDefinition17});
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition43});
+ rowDefinition10});
this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 52);
this.layoutControlGroup2.TextVisible = false;
//
@@ -2732,7 +3234,7 @@
this.gcMx3.Location = new System.Drawing.Point(0, 0);
this.gcMx3.MainView = this.gvMx3;
this.gcMx3.Name = "gcMx3";
- this.gcMx3.Size = new System.Drawing.Size(1648, 417);
+ this.gcMx3.Size = new System.Drawing.Size(1648, 408);
this.gcMx3.TabIndex = 1;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -2863,7 +3365,7 @@
//
this.xtraTabPage4.Controls.Add(this.splitMx100);
this.xtraTabPage4.Name = "xtraTabPage4";
- this.xtraTabPage4.Size = new System.Drawing.Size(1648, 481);
+ this.xtraTabPage4.Size = new System.Drawing.Size(1648, 472);
this.xtraTabPage4.Text = "鍚庣洊鐮佹槑缁�";
//
// splitMx100
@@ -2883,7 +3385,7 @@
this.splitMx100.Panel2.Controls.Add(this.gcMx4);
this.splitMx100.Panel2.Text = "Panel2";
this.splitMx100.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx100.Size = new System.Drawing.Size(1648, 481);
+ this.splitMx100.Size = new System.Drawing.Size(1648, 472);
this.splitMx100.SplitterPosition = 52;
this.splitMx100.TabIndex = 3;
//
@@ -2985,32 +3487,32 @@
this.layoutControlItem47});
this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup4.Name = "Root";
- columnDefinition90.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition90.Width = 100D;
- columnDefinition91.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition91.Width = 100D;
- columnDefinition92.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition92.Width = 100D;
- columnDefinition93.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition93.Width = 100D;
- columnDefinition94.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition94.Width = 100D;
- columnDefinition95.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition95.Width = 120D;
- columnDefinition96.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition96.Width = 150D;
+ columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition18.Width = 100D;
+ columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition19.Width = 100D;
+ columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition20.Width = 100D;
+ columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition21.Width = 100D;
+ columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition22.Width = 100D;
+ columnDefinition23.SizeType = System.Windows.Forms.SizeType.Absolute;
+ columnDefinition23.Width = 120D;
+ columnDefinition24.SizeType = System.Windows.Forms.SizeType.Absolute;
+ columnDefinition24.Width = 150D;
this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition90,
- columnDefinition91,
- columnDefinition92,
- columnDefinition93,
- columnDefinition94,
- columnDefinition95,
- columnDefinition96});
- rowDefinition44.Height = 100D;
- rowDefinition44.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition18,
+ columnDefinition19,
+ columnDefinition20,
+ columnDefinition21,
+ columnDefinition22,
+ columnDefinition23,
+ columnDefinition24});
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition44});
+ rowDefinition11});
this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 52);
this.layoutControlGroup4.TextVisible = false;
//
@@ -3093,7 +3595,7 @@
this.gcMx4.Location = new System.Drawing.Point(0, 0);
this.gcMx4.MainView = this.gvMx4;
this.gcMx4.Name = "gcMx4";
- this.gcMx4.Size = new System.Drawing.Size(1648, 417);
+ this.gcMx4.Size = new System.Drawing.Size(1648, 408);
this.gcMx4.TabIndex = 2;
this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx4});
@@ -3225,7 +3727,7 @@
this.xtraTabPage5.Controls.Add(this.ucBtnPrint101);
this.xtraTabPage5.Name = "xtraTabPage5";
this.xtraTabPage5.PageVisible = false;
- this.xtraTabPage5.Size = new System.Drawing.Size(1648, 481);
+ this.xtraTabPage5.Size = new System.Drawing.Size(1648, 472);
this.xtraTabPage5.Text = "鐗╂枡榻愬鏍囪瘑鍗�";
//
// ucBtnPrint101
@@ -3238,165 +3740,6 @@
this.ucBtnPrint101.rptParameter = null;
this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32);
this.ucBtnPrint101.TabIndex = 0;
- //
- // xtraTabPage6
- //
- this.xtraTabPage6.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
- this.xtraTabPage6.Appearance.Header.Options.UseForeColor = true;
- this.xtraTabPage6.Controls.Add(this.gcMx6);
- this.xtraTabPage6.Name = "xtraTabPage6";
- this.xtraTabPage6.Size = new System.Drawing.Size(1648, 481);
- this.xtraTabPage6.Text = "澶囨枡鏄庣粏";
- //
- // gcMx6
- //
- this.gcMx6.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx6.Location = new System.Drawing.Point(0, 0);
- this.gcMx6.MainView = this.gvMx6;
- this.gcMx6.Name = "gcMx6";
- this.gcMx6.Size = new System.Drawing.Size(1648, 481);
- this.gcMx6.TabIndex = 1;
- this.gcMx6.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx6});
- //
- // gvMx6
- //
- this.gvMx6.Appearance.HeaderPanel.Options.UseTextOptions = true;
- this.gvMx6.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx6.ColumnPanelRowHeight = 50;
- this.gvMx6.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn2,
- this.gridColumn9,
- this.gridColumn11,
- this.gridColumn20,
- this.gridColumn26,
- this.gridColumn28,
- this.gridColumn29,
- this.gridColumn49,
- this.gridColumn8,
- this.gridColumn50,
- this.gridColumn51});
- this.gvMx6.GridControl = this.gcMx6;
- this.gvMx6.Name = "gvMx6";
- this.gvMx6.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
- this.gvMx6.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx6.OptionsView.ShowGroupPanel = false;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "gvMx1Guid";
- this.gridColumn2.FieldName = "guid";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Width = 94;
- //
- // gridColumn9
- //
- this.gridColumn9.AppearanceCell.Options.UseFont = true;
- this.gridColumn9.Caption = "宸ュ崟鍗曞彿";
- this.gridColumn9.FieldName = "daa001";
- this.gridColumn9.MinWidth = 50;
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Tag = "query_a.dab001";
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 0;
- this.gridColumn9.Width = 94;
- //
- // gridColumn11
- //
- this.gridColumn11.AppearanceCell.Options.UseFont = true;
- this.gridColumn11.Caption = "鏉愭枡缂栫爜";
- this.gridColumn11.FieldName = "itemNo";
- this.gridColumn11.MinWidth = 50;
- this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Tag = "query_a.dab003";
- this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 1;
- this.gridColumn11.Width = 94;
- //
- // gridColumn20
- //
- this.gridColumn20.AppearanceCell.Options.UseFont = true;
- this.gridColumn20.Caption = "鏉愭枡鍚嶇О";
- this.gridColumn20.FieldName = "itemName";
- this.gridColumn20.MinWidth = 50;
- this.gridColumn20.Name = "gridColumn20";
- this.gridColumn20.Tag = "query_a.dab004";
- this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 2;
- this.gridColumn20.Width = 94;
- //
- // gridColumn26
- //
- this.gridColumn26.AppearanceCell.Options.UseFont = true;
- this.gridColumn26.Caption = "鏉愭枡瑙勬牸";
- this.gridColumn26.FieldName = "itemModel";
- this.gridColumn26.MinWidth = 50;
- this.gridColumn26.Name = "gridColumn26";
- this.gridColumn26.Tag = "query_a.dab005";
- this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 3;
- this.gridColumn26.Width = 94;
- //
- // gridColumn28
- //
- this.gridColumn28.Caption = "鐗╂枡鏉＄爜";
- this.gridColumn28.FieldName = "itemBarcode";
- this.gridColumn28.MinWidth = 25;
- this.gridColumn28.Name = "gridColumn28";
- this.gridColumn28.Visible = true;
- this.gridColumn28.VisibleIndex = 4;
- this.gridColumn28.Width = 94;
- //
- // gridColumn29
- //
- this.gridColumn29.Caption = "鏉＄爜鏁伴噺";
- this.gridColumn29.FieldName = "quantity";
- this.gridColumn29.MinWidth = 25;
- this.gridColumn29.Name = "gridColumn29";
- this.gridColumn29.Visible = true;
- this.gridColumn29.VisibleIndex = 5;
- this.gridColumn29.Width = 94;
- //
- // gridColumn49
- //
- this.gridColumn49.Caption = "澶囨枡璇︽儏";
- this.gridColumn49.FieldName = "blDetail";
- this.gridColumn49.MinWidth = 25;
- this.gridColumn49.Name = "gridColumn49";
- this.gridColumn49.Visible = true;
- this.gridColumn49.VisibleIndex = 6;
- this.gridColumn49.Width = 94;
- //
- // gridColumn8
- //
- this.gridColumn8.Caption = "鏀舵枡璇︽儏";
- this.gridColumn8.FieldName = "slDetail";
- this.gridColumn8.MinWidth = 25;
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 7;
- this.gridColumn8.Width = 94;
- //
- // gridColumn50
- //
- this.gridColumn50.Caption = "鎶曟枡璇︽儏";
- this.gridColumn50.FieldName = "tlDetail";
- this.gridColumn50.MinWidth = 25;
- this.gridColumn50.Name = "gridColumn50";
- this.gridColumn50.Visible = true;
- this.gridColumn50.VisibleIndex = 8;
- this.gridColumn50.Width = 94;
- //
- // gridColumn51
- //
- this.gridColumn51.Caption = "閫�鏂欒鎯�";
- this.gridColumn51.FieldName = "tuiDetail";
- this.gridColumn51.MinWidth = 25;
- this.gridColumn51.Name = "gridColumn51";
- this.gridColumn51.Visible = true;
- this.gridColumn51.VisibleIndex = 9;
- this.gridColumn51.Width = 94;
//
// Frm_Womdaa
//
@@ -3445,14 +3788,14 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa004.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dptNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa025.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
@@ -3460,27 +3803,37 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa015label)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem48)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ this.xtraTabPage6.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx6)).EndInit();
+ this.xtraTabPage7.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx7)).EndInit();
+ this.xtraTabPage8.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx8)).EndInit();
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx99.Panel1)).EndInit();
this.splitMx99.Panel1.ResumeLayout(false);
@@ -3561,9 +3914,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
this.xtraTabPage5.ResumeLayout(false);
- this.xtraTabPage6.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx6)).EndInit();
this.ResumeLayout(false);
}
@@ -3714,8 +4064,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
private DevExpress.Utils.ToolTipController tips;
- private DevExpress.XtraEditors.TextEdit txt_daa015;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraEditors.RadioGroup radOut;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
@@ -3754,7 +4102,6 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx99;
private DevExpress.XtraEditors.TextEdit txt_lineNo;
private DevExpress.XtraEditors.TextEdit txt_dptNo;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
@@ -3762,7 +4109,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
@@ -3784,13 +4130,11 @@
private DevExpress.XtraTab.XtraTabPage xtraTabPage5;
private UserControl.UcBtnPrint ucBtnPrint101;
private DevExpress.XtraEditors.CheckEdit txt_isQiTao;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem46;
private DevExpress.XtraEditors.SplitContainerControl splitMx98;
private DevExpress.XtraEditors.SplitContainerControl splitMx100;
private DevExpress.XtraEditors.SimpleButton btnDesign;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem47;
private DevExpress.XtraEditors.TextEdit txt_daa018;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem48;
private DevExpress.XtraTab.XtraTabPage xtraTabPage6;
private DevExpress.XtraGrid.GridControl gcMx6;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx6;
@@ -3805,5 +4149,36 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn50;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn51;
+ private UserControl.UcLookWorkline txt_daa015;
+ private DevExpress.XtraLayout.LayoutControlItem txt_daa015label;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage7;
+ private DevExpress.XtraGrid.GridControl gcMx7;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx7;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa002;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa010;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage8;
+ private DevExpress.XtraGrid.GridControl gcMx8;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn53;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx2status;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx2pbillNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn56;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx2tlQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn57;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn58;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn59;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn60;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn61;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn62;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem46;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem48;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_daa025;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 5c02edc..7995916 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,5 +1,6 @@
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
+using Gs.DevApp.DevFrm.WOM;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -24,7 +25,7 @@
this.splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
this.splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
- // this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
@@ -35,11 +36,16 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
+ this.toolBarMenu1.btnGxClick += ToolBarMenu1_btnGxClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx4);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx6);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx7);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx8);
+ txt_daa015.getSuppler("");
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -280,7 +286,26 @@
_filterList = e.FilterList;
getPageList(1);
}
-
+ /// <summary>
+ /// 宸ュ簭鍙樻洿
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnGxClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1, "daa001");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ var frm = new ShowGx(rowGuid);
+ frm.ShowDialog();
+ }
/// <summary>
/// 鍒犻櫎宸ュ崟
/// </summary>
@@ -452,7 +477,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -463,8 +488,8 @@
else
{
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- gvList.Add(gvMx2);
+ //gvList.Add(gvMx1);
+ //gvList.Add(gvMx2);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
}
}
@@ -476,36 +501,39 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
- //toolBarMenu1.isSetBtn = false;
- //var _obj = new
- //{
- // guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- // sjxt = txt_sjXt.GetId(), //瀹為檯绾夸綋
- // bz = txt_daa009.Text.Trim()//澶囨敞
- //};
- //try
- //{
- // string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
- // ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- // if (_rtn.rtnCode > 0)
- // {
- // lbGuid.Text = _rtn.rtnData;
- // toolBarMenu1.isSetBtn = true;
- // List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- // gvList.Add(gvMx1);
- // UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
- // toolBarMenu1.currentAction = "";
- // txt_printRemark.Enabled = txt_psnQty_1.Enabled = txt_iCount_1.Enabled = true;
- // txt_printRemark.ReadOnly = txt_psnQty_1.ReadOnly = txt_iCount_1.ReadOnly = false;
- // toolBarMenu1.currentAction = "";
- // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
- // }
- //}
- //catch (Exception ex)
- //{
- // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- //}
+ toolBarMenu1.isSetBtn = false;
+ var _obj = new
+ {
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ sjxt = txt_daa015.GetId(), //绾夸綋
+ sclx = txt_daa025.Text.Trim(),//鐢熶骇绫诲瀷
+ bz = txt_daa009.Text.Trim()//澶囨敞
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ lbGuid.Text = _rtn.rtnData;
+ toolBarMenu1.isSetBtn = true;
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ //gvList.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+ //toolBarMenu1.currentAction = "";
+ //txt_printRemark.Enabled = txt_psnQty_1.Enabled = txt_iCount_1.Enabled = true;
+ //txt_printRemark.ReadOnly = txt_psnQty_1.ReadOnly = txt_iCount_1.ReadOnly = false;
+ //toolBarMenu1.currentAction = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ }
+ else
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
}
/// <summary>
@@ -557,12 +585,12 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -576,9 +604,6 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
- //string cjId = dy.daa013;
- //string xjxt = dy.sjXt;
- // txt_sjXt.getSuppler(cjId, xjxt);
//鎵樻澘鐮�
txt_zQty.Text = dy.daa008;
txt_yQty.Text = dy.yQty;
@@ -696,7 +721,7 @@
}
}
- //2025-7-20鍔犱笂浜х嚎纭
+ //2025-7-20鍔犱笂浜х嚎纭璁板綍
JArray array6 = new JArray();
foreach (var a in _job["rtnData"]["list6"])
{
@@ -715,7 +740,42 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx6, gvMx6);
}
-
+ JArray array7 = new JArray();
+ foreach (var a in _job["rtnData"]["list7"])
+ {
+ array7.Add(a);
+ }
+ DataTable dt7 = JsonConvert.DeserializeObject<DataTable>(array7.ToString());
+ if (dt7.Rows.Count > 0)
+ {
+ gcMx7.BindingContext = new BindingContext();
+ gcMx7.DataSource = dt7;
+ gcMx7.ForceInitialize();
+ gvMx7.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx7);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx7, gvMx7);
+ }
+ JArray array8 = new JArray();
+ foreach (var a in _job["rtnData"]["list8"])
+ {
+ array8.Add(a);
+ }
+ DataTable dt8 = JsonConvert.DeserializeObject<DataTable>(array8.ToString());
+ if (dt8.Rows.Count > 0)
+ {
+ gcMx8.BindingContext = new BindingContext();
+ gcMx8.DataSource = dt8;
+ gcMx8.ForceInitialize();
+ gvMx8.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx8);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx8, gvMx8);
+ }
txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index 0b06699..83b6102 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -30,18 +30,18 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Wompba));
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -105,26 +105,15 @@
this.gvMx1daa012 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa017 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa019 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa020 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa021 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa022 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa023 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa024 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa025 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa026 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1isReportcheck = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa014 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1machineNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -171,9 +160,10 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
@@ -554,29 +544,29 @@
this.layoutControlItem8});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
this.Root.Size = new System.Drawing.Size(1105, 113);
this.Root.TextVisible = false;
//
@@ -696,7 +686,8 @@
this.repositoryItemDateEdit2,
this.repositoryItemButtonEdit1,
this.rptJYBZ,
- this.repositoryItemDateEdit3});
+ this.repositoryItemDateEdit3,
+ this.repositoryItemComboBox1});
this.gcMx1.Size = new System.Drawing.Size(1124, 417);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -724,24 +715,12 @@
this.gvMx1daa011,
this.gvMx1daa012,
this.gvMx1reporttime,
- this.gvMx1daa017,
- this.gvMx1daa019,
- this.gvMx1checkDate,
- this.gvMx1checkUser,
- this.gvMx1daa020,
- this.gvMx1daa021,
- this.gvMx1daa022,
- this.gvMx1daa023,
- this.gvMx1daa024,
- this.gvMx1daa025,
- this.gvMx1daa026,
- this.gvMx1isReportcheck,
this.gvMx1daa014,
- this.gvMx1machineNo,
this.gridColumn3,
this.gvMx1fstatus,
this.gridColumn6,
- this.gvMxDel});
+ this.gvMxDel,
+ this.gridColumn7});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1006,148 +985,6 @@
this.gvMx1reporttime.VisibleIndex = 13;
this.gvMx1reporttime.Width = 102;
//
- // gvMx1daa017
- //
- this.gvMx1daa017.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1daa017.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa017.AppearanceCell.Options.UseForeColor = true;
- this.gvMx1daa017.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1daa017.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1daa017.Caption = "璁″垝浜烘暟";
- this.gvMx1daa017.FieldName = "planPersonnel";
- this.gvMx1daa017.MinWidth = 50;
- this.gvMx1daa017.Name = "gvMx1daa017";
- this.gvMx1daa017.Tag = "yz_quantity_0";
- this.gvMx1daa017.Width = 50;
- //
- // gvMx1daa019
- //
- this.gvMx1daa019.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa019.Caption = "鎺掍骇鏃ユ湡";
- this.gvMx1daa019.FieldName = "daa024";
- this.gvMx1daa019.MinWidth = 50;
- this.gvMx1daa019.Name = "gvMx1daa019";
- this.gvMx1daa019.OptionsColumn.ReadOnly = true;
- this.gvMx1daa019.Tag = "query_a.daa019";
- this.gvMx1daa019.Width = 50;
- //
- // gvMx1checkDate
- //
- this.gvMx1checkDate.AppearanceCell.Options.UseFont = true;
- this.gvMx1checkDate.Caption = "绾夸綋绫诲埆";
- this.gvMx1checkDate.FieldName = "lineType";
- this.gvMx1checkDate.MinWidth = 50;
- this.gvMx1checkDate.Name = "gvMx1checkDate";
- this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
- this.gvMx1checkDate.Tag = "query_a.check_date";
- this.gvMx1checkDate.Width = 50;
- //
- // gvMx1checkUser
- //
- this.gvMx1checkUser.AppearanceCell.Options.UseFont = true;
- this.gvMx1checkUser.Caption = "鏍囧噯浜烘暟";
- this.gvMx1checkUser.FieldName = "personnel";
- this.gvMx1checkUser.MinWidth = 50;
- this.gvMx1checkUser.Name = "gvMx1checkUser";
- this.gvMx1checkUser.OptionsColumn.ReadOnly = true;
- this.gvMx1checkUser.Tag = "query_a.check_user";
- this.gvMx1checkUser.Width = 50;
- //
- // gvMx1daa020
- //
- this.gvMx1daa020.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa020.Caption = "鏍囧噯宸ユ椂";
- this.gvMx1daa020.FieldName = "prodHour";
- this.gvMx1daa020.MinWidth = 50;
- this.gvMx1daa020.Name = "gvMx1daa020";
- this.gvMx1daa020.OptionsColumn.ReadOnly = true;
- this.gvMx1daa020.Tag = "query_a.daa020";
- this.gvMx1daa020.Width = 50;
- //
- // gvMx1daa021
- //
- this.gvMx1daa021.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa021.Caption = "鍗曚汉灏忔椂浜ц兘";
- this.gvMx1daa021.FieldName = "personHourCapactity";
- this.gvMx1daa021.MinWidth = 50;
- this.gvMx1daa021.Name = "gvMx1daa021";
- this.gvMx1daa021.OptionsColumn.ReadOnly = true;
- this.gvMx1daa021.Tag = "query_a.daa021";
- this.gvMx1daa021.Width = 50;
- //
- // gvMx1daa022
- //
- this.gvMx1daa022.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa022.Caption = "鐞嗚鏍囦骇";
- this.gvMx1daa022.FieldName = "theCapactity";
- this.gvMx1daa022.MinWidth = 50;
- this.gvMx1daa022.Name = "gvMx1daa022";
- this.gvMx1daa022.OptionsColumn.ReadOnly = true;
- this.gvMx1daa022.Tag = "query_a.daa022";
- this.gvMx1daa022.Width = 50;
- //
- // gvMx1daa023
- //
- this.gvMx1daa023.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa023.Caption = "璁″垝鏍囧噯浜ц兘";
- this.gvMx1daa023.FieldName = "planCapactity";
- this.gvMx1daa023.MinWidth = 50;
- this.gvMx1daa023.Name = "gvMx1daa023";
- this.gvMx1daa023.OptionsColumn.ReadOnly = true;
- this.gvMx1daa023.Tag = "query_a.daa023";
- this.gvMx1daa023.Width = 50;
- //
- // gvMx1daa024
- //
- this.gvMx1daa024.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa024.Caption = "鍒嗛挓";
- this.gvMx1daa024.FieldName = "theMin";
- this.gvMx1daa024.MinWidth = 50;
- this.gvMx1daa024.Name = "gvMx1daa024";
- this.gvMx1daa024.OptionsColumn.ReadOnly = true;
- this.gvMx1daa024.Tag = "query_a.daa024";
- this.gvMx1daa024.Width = 50;
- //
- // gvMx1daa025
- //
- this.gvMx1daa025.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa025.Caption = "灏忔椂";
- this.gvMx1daa025.FieldName = "theHour";
- this.gvMx1daa025.MinWidth = 50;
- this.gvMx1daa025.Name = "gvMx1daa025";
- this.gvMx1daa025.OptionsColumn.ReadOnly = true;
- this.gvMx1daa025.Tag = "query_a.daa025";
- this.gvMx1daa025.Width = 50;
- //
- // gvMx1daa026
- //
- this.gvMx1daa026.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1daa026.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa026.AppearanceCell.Options.UseForeColor = true;
- this.gvMx1daa026.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1daa026.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1daa026.Caption = "鎹㈢嚎鏃堕棿";
- this.gvMx1daa026.FieldName = "changeLineTime";
- this.gvMx1daa026.MinWidth = 50;
- this.gvMx1daa026.Name = "gvMx1daa026";
- this.gvMx1daa026.Tag = "yz_quantity_0";
- this.gvMx1daa026.Width = 50;
- //
- // gvMx1isReportcheck
- //
- this.gvMx1isReportcheck.AppearanceCell.ForeColor = System.Drawing.Color.Black;
- this.gvMx1isReportcheck.AppearanceCell.Options.UseFont = true;
- this.gvMx1isReportcheck.AppearanceCell.Options.UseForeColor = true;
- this.gvMx1isReportcheck.AppearanceHeader.ForeColor = System.Drawing.Color.Black;
- this.gvMx1isReportcheck.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1isReportcheck.Caption = "浼戞伅鏃堕棿";
- this.gvMx1isReportcheck.FieldName = "restTime";
- this.gvMx1isReportcheck.MinWidth = 50;
- this.gvMx1isReportcheck.Name = "gvMx1isReportcheck";
- this.gvMx1isReportcheck.OptionsColumn.ReadOnly = true;
- this.gvMx1isReportcheck.Tag = "query_a.is_reportcheck";
- this.gvMx1isReportcheck.Width = 50;
- //
// gvMx1daa014
//
this.gvMx1daa014.AppearanceCell.Options.UseFont = true;
@@ -1160,35 +997,6 @@
this.gvMx1daa014.Visible = true;
this.gvMx1daa014.VisibleIndex = 14;
this.gvMx1daa014.Width = 51;
- //
- // gvMx1machineNo
- //
- this.gvMx1machineNo.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1machineNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1machineNo.AppearanceCell.Options.UseForeColor = true;
- this.gvMx1machineNo.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1machineNo.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1machineNo.Caption = "棰勮澶囨枡鏃堕棿";
- this.gvMx1machineNo.ColumnEdit = this.repositoryItemDateEdit1;
- this.gvMx1machineNo.FieldName = "prepareTime";
- this.gvMx1machineNo.MinWidth = 50;
- this.gvMx1machineNo.Name = "gvMx1machineNo";
- this.gvMx1machineNo.Tag = "query_a.machine_no";
- this.gvMx1machineNo.Width = 200;
- //
- // repositoryItemDateEdit1
- //
- this.repositoryItemDateEdit1.AutoHeight = false;
- this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemDateEdit1.DisplayFormat.FormatString = "D";
- this.repositoryItemDateEdit1.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
- this.repositoryItemDateEdit1.EditFormat.FormatString = "D";
- this.repositoryItemDateEdit1.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
- this.repositoryItemDateEdit1.MaskSettings.Set("mask", "D");
- this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
//
// gridColumn3
//
@@ -1234,13 +1042,51 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn7.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn7.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn7.Caption = "鐢熶骇绫诲瀷";
+ this.gridColumn7.ColumnEdit = this.repositoryItemComboBox1;
+ this.gridColumn7.FieldName = "daa025";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Tag = "edit";
+ this.gridColumn7.Width = 94;
+ //
+ // repositoryItemComboBox1
+ //
+ this.repositoryItemComboBox1.AutoHeight = false;
+ this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox1.Items.AddRange(new object[] {
+ "F-閲忎骇"});
+ this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+ this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // repositoryItemDateEdit1
+ //
+ this.repositoryItemDateEdit1.AutoHeight = false;
+ this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemDateEdit1.DisplayFormat.FormatString = "D";
+ this.repositoryItemDateEdit1.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+ this.repositoryItemDateEdit1.EditFormat.FormatString = "D";
+ this.repositoryItemDateEdit1.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+ this.repositoryItemDateEdit1.MaskSettings.Set("mask", "D");
+ this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
//
// picCheckBox
//
@@ -1307,9 +1153,10 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -1373,21 +1220,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa011;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa012;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa017;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa019;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkUser;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa020;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa021;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa022;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa023;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa024;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa025;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa026;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1isReportcheck;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa014;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1reporttime;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1machineNo;
private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
@@ -1399,5 +1233,7 @@
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;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index c9940e3..13a5612 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -368,10 +368,8 @@
AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["caaGuid"].ToString()),
LineId = row["daa015"].ToString(),//浜х嚎id
Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
- Jhrs = row["planPersonnel"].ToString(),//璁″垝浜烘暟
- Hxsj = row["changeLinetime"].ToString(),//鎹㈢嚎鏃堕棿
+ Hxsj = row["daa025"].ToString(),//鐢熶骇绫诲瀷
Bz = row["daa009"].ToString(),//澶囨敞
- Blsj = row["prepareTime"].ToString(),//棰勮澶囨枡鏃堕棿
Pcsl = row["daa008"].ToString(),//鎺掍骇鏁伴噺
Yjwgsj = row["mesEndProd"].ToString()//棰勮瀹屽伐鏃堕棿
});
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/ShowGx.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/ShowGx.Designer.cs
new file mode 100644
index 0000000..5077121
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/ShowGx.Designer.cs
@@ -0,0 +1,272 @@
+锘縩amespace Gs.DevApp.DevFrm.WOM
+{
+ partial class ShowGx
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ DevExpress.XtraGrid.GridLevelNode gridLevelNode1 = new DevExpress.XtraGrid.GridLevelNode();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ this.btnCancel = new DevExpress.XtraEditors.SimpleButton();
+ this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+ this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx7 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx7 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptGx = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptGxShang = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.btnSave = new DevExpress.XtraEditors.SimpleButton();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+ this.tabMx.SuspendLayout();
+ this.tabMxPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptGx)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptGxShang)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ this.panel1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // btnCancel
+ //
+ this.btnCancel.Appearance.Options.UseFont = true;
+ this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
+ this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnCancel.Location = new System.Drawing.Point(468, 7);
+ this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.btnCancel.Name = "btnCancel";
+ this.btnCancel.Size = new System.Drawing.Size(87, 37);
+ this.btnCancel.TabIndex = 242;
+ this.btnCancel.Text = "鍙栨秷 (&C)";
+ //
+ // tabMx
+ //
+ this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Name = "tabMx";
+ this.tabMx.SelectedTabPage = this.tabMxPage1;
+ this.tabMx.Size = new System.Drawing.Size(591, 492);
+ this.tabMx.TabIndex = 243;
+ this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.tabMxPage1});
+ //
+ // tabMxPage1
+ //
+ this.tabMxPage1.Controls.Add(this.gcMx7);
+ this.tabMxPage1.Name = "tabMxPage1";
+ this.tabMxPage1.Size = new System.Drawing.Size(589, 460);
+ this.tabMxPage1.Text = "宸ュ簭淇℃伅";
+ //
+ // gcMx7
+ //
+ this.gcMx7.Dock = System.Windows.Forms.DockStyle.Fill;
+ gridLevelNode1.RelationName = "Level1";
+ this.gcMx7.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {
+ gridLevelNode1});
+ this.gcMx7.Location = new System.Drawing.Point(0, 0);
+ this.gcMx7.MainView = this.gvMx7;
+ this.gcMx7.Name = "gcMx7";
+ this.gcMx7.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1,
+ this.rptGxShang,
+ this.rptGx});
+ this.gcMx7.Size = new System.Drawing.Size(589, 460);
+ this.gcMx7.TabIndex = 0;
+ this.gcMx7.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx7});
+ //
+ // gvMx7
+ //
+ this.gvMx7.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMx7.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx7.ColumnPanelRowHeight = 50;
+ this.gvMx7.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gvMx1daa010,
+ this.gvMx1daa004,
+ this.gvMxDel,
+ this.gridColumn3});
+ this.gvMx7.GridControl = this.gcMx7;
+ this.gvMx7.Name = "gvMx7";
+ this.gvMx7.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+ this.gvMx7.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx7.OptionsView.ShowGroupPanel = false;
+ //
+ // gvMx1daa010
+ //
+ this.gvMx1daa010.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa010.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1daa010.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1daa010.AppearanceHeader.Options.UseForeColor = true;
+ this.gvMx1daa010.Caption = "宸ュ簭";
+ this.gvMx1daa010.ColumnEdit = this.rptGx;
+ this.gvMx1daa010.FieldName = "processNo";
+ this.gvMx1daa010.MinWidth = 50;
+ this.gvMx1daa010.Name = "gvMx1daa010";
+ this.gvMx1daa010.Tag = "edit";
+ this.gvMx1daa010.Visible = true;
+ this.gvMx1daa010.VisibleIndex = 0;
+ this.gvMx1daa010.Width = 129;
+ //
+ // rptGx
+ //
+ this.rptGx.AutoHeight = false;
+ this.rptGx.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptGx.Name = "rptGx";
+ this.rptGx.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // gvMx1daa004
+ //
+ this.gvMx1daa004.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa004.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1daa004.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1daa004.AppearanceHeader.Options.UseForeColor = true;
+ this.gvMx1daa004.Caption = "涓婂伐搴�";
+ this.gvMx1daa004.ColumnEdit = this.rptGxShang;
+ this.gvMx1daa004.FieldName = "frontProcessNo";
+ this.gvMx1daa004.MinWidth = 150;
+ this.gvMx1daa004.Name = "gvMx1daa004";
+ this.gvMx1daa004.Tag = "edit";
+ this.gvMx1daa004.Visible = true;
+ this.gvMx1daa004.VisibleIndex = 1;
+ this.gvMx1daa004.Width = 150;
+ //
+ // rptGxShang
+ //
+ this.rptGxShang.AutoHeight = false;
+ this.rptGxShang.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptGxShang.Name = "rptGxShang";
+ this.rptGxShang.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // gvMxDel
+ //
+ this.gvMxDel.Caption = "绉诲嚭";
+ this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gvMxDel.MinWidth = 25;
+ this.gvMxDel.Name = "gvMxDel";
+ this.gvMxDel.OptionsColumn.ReadOnly = true;
+ this.gvMxDel.Visible = true;
+ this.gvMxDel.VisibleIndex = 2;
+ this.gvMxDel.Width = 65;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "涓婚敭Guid";
+ this.gridColumn3.FieldName = "guid";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.ReadOnly = true;
+ this.gridColumn3.Width = 94;
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.btnSave);
+ this.panel1.Controls.Add(this.btnCancel);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panel1.Location = new System.Drawing.Point(0, 444);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(591, 48);
+ this.panel1.TabIndex = 244;
+ //
+ // btnSave
+ //
+ this.btnSave.Appearance.Options.UseFont = true;
+ this.btnSave.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
+ this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnSave.Location = new System.Drawing.Point(328, 7);
+ this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.btnSave.Name = "btnSave";
+ this.btnSave.Size = new System.Drawing.Size(87, 37);
+ this.btnSave.TabIndex = 240;
+ this.btnSave.Text = "纭畾 (&L)";
+ //
+ // ShowGx
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(591, 492);
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.tabMx);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "ShowGx";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "宸ュ簭鍙樻洿";
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+ this.tabMx.ResumeLayout(false);
+ this.tabMxPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptGx)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptGxShang)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ this.panel1.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraEditors.SimpleButton btnCancel;
+ private DevExpress.XtraTab.XtraTabControl tabMx;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+ private DevExpress.XtraGrid.GridControl gcMx7;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx7;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa010;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptGxShang;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private System.Windows.Forms.Panel panel1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptGx;
+ private DevExpress.XtraEditors.SimpleButton btnSave;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/ShowGx.cs b/DevApp/Gs.DevApp/DevFrm/WOM/ShowGx.cs
new file mode 100644
index 0000000..8c57380
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/ShowGx.cs
@@ -0,0 +1,122 @@
+锘縰sing DevExpress.Utils.DirectXPaint;
+using DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.WOM
+{
+ public partial class ShowGx : DevExpress.XtraEditors.XtraForm
+ {
+ private string daaGuid;
+ public ShowGx(string _daaGuid)
+ {
+ this.daaGuid = _daaGuid;
+ InitializeComponent();
+ btnCancel.Click += (s, e) =>
+ {
+ this.Close();
+ };
+ _getListJyxm();
+ getModel(daaGuid);
+ }
+
+ private void getModel(string strGuid)
+ {
+ var _obj = new
+ {
+ guid = strGuid,//涓诲缓
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", "WomdaaManager/GetModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ JObject _job = JObject.Parse(strJson);
+ JArray array7 = new JArray();
+ foreach (var a in _job["rtnData"]["list7"])
+ {
+ array7.Add(a);
+ }
+ DataTable dt7 = JsonConvert.DeserializeObject<DataTable>(array7.ToString());
+ if (dt7.Rows.Count > 0)
+ {
+ gcMx7.BindingContext = new BindingContext();
+ gcMx7.DataSource = dt7;
+ gcMx7.ForceInitialize();
+ gvMx7.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx7);
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx7);
+ UtilityHelper.ChangeEnableByControl(this.tabMx.Controls, true, gvList);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx7, gvMx7);
+ }
+ }
+ else
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 璇诲彇宸ュ簭涓嬫媺
+ /// </summary>
+ private void _getListJyxm()
+ {
+ var pgq = new PageQueryModel(1, 999999, "a.processNo", "asc", "", "");
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "WorkPro/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ DataTable dt = dd.rtnData.list;
+ rptGxShang.Items.Add("绌�");
+ foreach (DataRow dr in dt.Rows)
+ {
+ rptGx.Items.Add(dr["processNo"].ToString());
+ rptGxShang.Items.Add(dr["processNo"].ToString());
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ /// 绉诲嚭
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx7.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx7.GetDataRow(rowhandle);
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ gvMx7.DeleteRow(rowhandle);
+ return;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/ShowGx.resx b/DevApp/Gs.DevApp/DevFrm/WOM/ShowGx.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/ShowGx.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
index b3ad3dd..359f607 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
@@ -37,7 +37,6 @@
DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraGrid.GridLevelNode gridLevelNode1 = new DevExpress.XtraGrid.GridLevelNode();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -72,7 +71,6 @@
this.txt_fBegDate = new DevExpress.XtraEditors.DateEdit();
this.txt_fEndDate = new DevExpress.XtraEditors.DateEdit();
this.txt_orgName = new DevExpress.XtraEditors.TextEdit();
- this.txt_fType = new DevExpress.XtraEditors.ComboBoxEdit();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.txt_lastUpdateBy = new DevExpress.XtraEditors.TextEdit();
@@ -85,25 +83,22 @@
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -122,6 +117,8 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -155,7 +152,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_orgName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateDate.Properties)).BeginInit();
@@ -166,25 +162,22 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -195,6 +188,8 @@
((System.ComponentModel.ISupportInitialize)(this.rptGx)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -379,7 +374,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(775, 632);
- this.splitMx1.SplitterPosition = 177;
+ this.splitMx1.SplitterPosition = 140;
this.splitMx1.TabIndex = 1;
//
// layoutMx1
@@ -397,7 +392,6 @@
this.layoutMx1.Controls.Add(this.txt_fBegDate);
this.layoutMx1.Controls.Add(this.txt_fEndDate);
this.layoutMx1.Controls.Add(this.txt_orgName);
- this.layoutMx1.Controls.Add(this.txt_fType);
this.layoutMx1.Controls.Add(this.btnSelect);
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Controls.Add(this.txt_lastUpdateBy);
@@ -411,12 +405,14 @@
this.layoutControlItem24,
this.layoutControlItem2,
this.layoutControlItem16,
- this.layoutControlItem9});
+ this.layoutControlItem9,
+ this.layoutControlItem4,
+ this.layoutControlItem7});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(168, 334, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(131, 442, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(775, 177);
+ this.layoutMx1.Size = new System.Drawing.Size(775, 140);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -431,20 +427,20 @@
//
// txt_fMaxWeight
//
- this.txt_fMaxWeight.Location = new System.Drawing.Point(537, 12);
+ this.txt_fMaxWeight.Location = new System.Drawing.Point(524, 12);
this.txt_fMaxWeight.Name = "txt_fMaxWeight";
this.txt_fMaxWeight.Properties.Appearance.Options.UseFont = true;
- this.txt_fMaxWeight.Size = new System.Drawing.Size(75, 24);
+ this.txt_fMaxWeight.Size = new System.Drawing.Size(71, 24);
this.txt_fMaxWeight.StyleController = this.layoutMx1;
this.txt_fMaxWeight.TabIndex = 378;
this.txt_fMaxWeight.Tag = "fissueType";
//
// txt_fMinWeight
//
- this.txt_fMinWeight.Location = new System.Drawing.Point(537, 43);
+ this.txt_fMinWeight.Location = new System.Drawing.Point(524, 43);
this.txt_fMinWeight.Name = "txt_fMinWeight";
this.txt_fMinWeight.Properties.Appearance.Options.UseFont = true;
- this.txt_fMinWeight.Size = new System.Drawing.Size(75, 24);
+ this.txt_fMinWeight.Size = new System.Drawing.Size(71, 24);
this.txt_fMinWeight.StyleController = this.layoutMx1;
this.txt_fMinWeight.TabIndex = 370;
this.txt_fMinWeight.Tag = "finishRate";
@@ -454,7 +450,7 @@
this.txt_itemName.Location = new System.Drawing.Point(84, 74);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(226, 27);
+ this.txt_itemName.Size = new System.Drawing.Size(217, 27);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 216;
this.txt_itemName.Tag = "readonly";
@@ -474,7 +470,7 @@
this.txt_itemNo.Location = new System.Drawing.Point(84, 43);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(226, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(217, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 213;
this.txt_itemNo.Tag = "readonly";
@@ -491,20 +487,20 @@
//
// txt_fCapacity
//
- this.txt_fCapacity.Location = new System.Drawing.Point(537, 74);
+ this.txt_fCapacity.Location = new System.Drawing.Point(377, 43);
this.txt_fCapacity.Name = "txt_fCapacity";
this.txt_fCapacity.Properties.Appearance.Options.UseFont = true;
- this.txt_fCapacity.Size = new System.Drawing.Size(75, 24);
+ this.txt_fCapacity.Size = new System.Drawing.Size(71, 24);
this.txt_fCapacity.StyleController = this.layoutMx1;
this.txt_fCapacity.TabIndex = 319;
this.txt_fCapacity.Tag = "bomNo";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(84, 105);
+ this.txt_remark.Location = new System.Drawing.Point(377, 105);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(226, 24);
+ this.txt_remark.Size = new System.Drawing.Size(218, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 258;
this.txt_remark.Tag = "lowLimt";
@@ -512,7 +508,7 @@
// txt_fJingDu
//
this.txt_fJingDu.EditValue = "PSC娴�";
- this.txt_fJingDu.Location = new System.Drawing.Point(386, 43);
+ this.txt_fJingDu.Location = new System.Drawing.Point(377, 12);
this.txt_fJingDu.Name = "txt_fJingDu";
this.txt_fJingDu.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -520,7 +516,7 @@
"PCS娴�",
"LOT娴�"});
this.txt_fJingDu.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fJingDu.Size = new System.Drawing.Size(75, 24);
+ this.txt_fJingDu.Size = new System.Drawing.Size(71, 24);
this.txt_fJingDu.StyleController = this.layoutMx1;
this.txt_fJingDu.TabIndex = 413;
//
@@ -554,32 +550,17 @@
//
this.txt_orgName.Location = new System.Drawing.Point(84, 12);
this.txt_orgName.Name = "txt_orgName";
- this.txt_orgName.Size = new System.Drawing.Size(226, 24);
+ this.txt_orgName.Size = new System.Drawing.Size(217, 24);
this.txt_orgName.StyleController = this.layoutMx1;
this.txt_orgName.TabIndex = 417;
this.txt_orgName.Tag = "readonly";
- //
- // txt_fType
- //
- this.txt_fType.EditValue = "F-閲忎骇";
- this.txt_fType.Location = new System.Drawing.Point(386, 12);
- this.txt_fType.Name = "txt_fType";
- this.txt_fType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_fType.Properties.Items.AddRange(new object[] {
- "F-閲忎骇",
- "S-璇曚綔"});
- this.txt_fType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fType.Size = new System.Drawing.Size(75, 24);
- this.txt_fType.StyleController = this.layoutMx1;
- this.txt_fType.TabIndex = 418;
//
// btnSelect
//
this.btnSelect.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
this.btnSelect.Appearance.Options.UseBackColor = true;
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 136);
+ this.btnSelect.Location = new System.Drawing.Point(12, 105);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(96, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -596,46 +577,46 @@
//
// txt_lastUpdateBy
//
- this.txt_lastUpdateBy.Location = new System.Drawing.Point(688, 12);
+ this.txt_lastUpdateBy.Location = new System.Drawing.Point(671, 12);
this.txt_lastUpdateBy.Name = "txt_lastUpdateBy";
- this.txt_lastUpdateBy.Size = new System.Drawing.Size(75, 24);
+ this.txt_lastUpdateBy.Size = new System.Drawing.Size(71, 24);
this.txt_lastUpdateBy.StyleController = this.layoutMx1;
this.txt_lastUpdateBy.TabIndex = 421;
this.txt_lastUpdateBy.Tag = "readonly";
//
// txt_lastUpdateDate
//
- this.txt_lastUpdateDate.Location = new System.Drawing.Point(688, 43);
+ this.txt_lastUpdateDate.Location = new System.Drawing.Point(671, 43);
this.txt_lastUpdateDate.Name = "txt_lastUpdateDate";
- this.txt_lastUpdateDate.Size = new System.Drawing.Size(75, 24);
+ this.txt_lastUpdateDate.Size = new System.Drawing.Size(71, 24);
this.txt_lastUpdateDate.StyleController = this.layoutMx1;
this.txt_lastUpdateDate.TabIndex = 422;
this.txt_lastUpdateDate.Tag = "readonly";
//
// txt_checkBy
//
- this.txt_checkBy.Location = new System.Drawing.Point(688, 74);
+ this.txt_checkBy.Location = new System.Drawing.Point(671, 74);
this.txt_checkBy.Name = "txt_checkBy";
- this.txt_checkBy.Size = new System.Drawing.Size(75, 24);
+ this.txt_checkBy.Size = new System.Drawing.Size(71, 24);
this.txt_checkBy.StyleController = this.layoutMx1;
this.txt_checkBy.TabIndex = 423;
this.txt_checkBy.Tag = "readonly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(688, 105);
+ this.txt_checkDate.Location = new System.Drawing.Point(671, 105);
this.txt_checkDate.Name = "txt_checkDate";
- this.txt_checkDate.Size = new System.Drawing.Size(75, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(71, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 424;
this.txt_checkDate.Tag = "readonly";
//
// txt_isCheck
//
- this.txt_isCheck.Location = new System.Drawing.Point(616, 136);
+ this.txt_isCheck.Location = new System.Drawing.Point(452, 74);
this.txt_isCheck.Name = "txt_isCheck";
this.txt_isCheck.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_isCheck.Size = new System.Drawing.Size(147, 24);
+ this.txt_isCheck.Size = new System.Drawing.Size(143, 24);
this.txt_isCheck.StyleController = this.layoutMx1;
this.txt_isCheck.TabIndex = 425;
this.txt_isCheck.Tag = "readonly";
@@ -645,9 +626,9 @@
this.btnCopy.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
this.btnCopy.Appearance.Options.UseBackColor = true;
this.btnCopy.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.copy_16x16;
- this.btnCopy.Location = new System.Drawing.Point(163, 136);
+ this.btnCopy.Location = new System.Drawing.Point(158, 105);
this.btnCopy.Name = "btnCopy";
- this.btnCopy.Size = new System.Drawing.Size(147, 27);
+ this.btnCopy.Size = new System.Drawing.Size(143, 27);
this.btnCopy.StyleController = this.layoutMx1;
this.btnCopy.TabIndex = 426;
this.btnCopy.Text = "澶嶅埗鍒板叾瀹冧骇鍝�";
@@ -698,6 +679,29 @@
this.layoutControlItem9.Text = "澶辨晥鏃ユ湡";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_fBegDate;
+ this.layoutControlItem4.Location = new System.Drawing.Point(302, 93);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem4.Size = new System.Drawing.Size(302, 31);
+ this.layoutControlItem4.Text = "鐢熸晥鏃ユ湡";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_fSumPeople;
+ this.layoutControlItem7.Location = new System.Drawing.Point(302, 62);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem7.Size = new System.Drawing.Size(151, 31);
+ this.layoutControlItem7.Text = "鎬诲畾鍛�";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -707,20 +711,17 @@
this.layoutControlItem5,
this.layoutControlItem14,
this.layoutControlItem20,
- this.layoutControlItem6,
- this.layoutControlItem3,
- this.layoutControlItem7,
- this.layoutControlItem25,
this.layoutControlItem18,
this.layoutControlItem19,
this.layoutControlItem23,
this.layoutControlItem22,
- this.layoutControlItem8,
- this.layoutControlItem4,
- this.layoutControlItem12,
+ this.layoutControlItem21,
this.layoutControlItem15,
this.layoutControlItem10,
- this.layoutControlItem21});
+ this.layoutControlItem25,
+ this.layoutControlItem12,
+ this.layoutControlItem3,
+ this.layoutControlItem8});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -747,15 +748,12 @@
rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition4.Height = 100D;
rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
rowDefinition3,
- rowDefinition4,
- rowDefinition5});
- this.Root.Size = new System.Drawing.Size(775, 177);
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(754, 144);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -765,7 +763,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem1.Size = new System.Drawing.Size(302, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(293, 31);
this.layoutControlItem1.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
@@ -776,7 +774,7 @@
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(302, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(293, 31);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
@@ -786,7 +784,7 @@
this.layoutControlItem14.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(302, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(293, 31);
this.layoutControlItem14.Text = "浣跨敤缁勭粐";
this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
//
@@ -794,144 +792,76 @@
//
this.layoutControlItem20.Control = this.txt_lastUpdateBy;
this.layoutControlItem20.CustomizationFormText = "鏇存柊浜哄憳";
- this.layoutControlItem20.Location = new System.Drawing.Point(604, 0);
+ this.layoutControlItem20.Location = new System.Drawing.Point(587, 0);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem20.Size = new System.Drawing.Size(151, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(147, 31);
this.layoutControlItem20.Text = "鏇存柊浜哄憳";
this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_fType;
- this.layoutControlItem6.Location = new System.Drawing.Point(302, 0);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(151, 31);
- this.layoutControlItem6.Text = "鐢熶骇绫诲瀷";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_fJingDu;
- this.layoutControlItem3.Location = new System.Drawing.Point(302, 31);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(151, 31);
- this.layoutControlItem3.Text = "绠＄悊绮惧害";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_fSumPeople;
- this.layoutControlItem7.Location = new System.Drawing.Point(302, 62);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(151, 31);
- this.layoutControlItem7.Text = "鎬诲畾鍛�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem25
- //
- this.layoutControlItem25.Control = this.txt_isCheck;
- this.layoutControlItem25.Location = new System.Drawing.Point(604, 124);
- this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem25.Size = new System.Drawing.Size(151, 33);
- this.layoutControlItem25.Text = "瀹℃牳鐘舵��";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem25.TextVisible = false;
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_fMaxWeight;
- this.layoutControlItem18.Location = new System.Drawing.Point(453, 0);
+ this.layoutControlItem18.Location = new System.Drawing.Point(440, 0);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(151, 31);
+ this.layoutControlItem18.Size = new System.Drawing.Size(147, 31);
this.layoutControlItem18.Text = "閲嶉噺涓婇檺";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_fMinWeight;
- this.layoutControlItem19.Location = new System.Drawing.Point(453, 31);
+ this.layoutControlItem19.Location = new System.Drawing.Point(440, 31);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(151, 31);
+ this.layoutControlItem19.Size = new System.Drawing.Size(147, 31);
this.layoutControlItem19.Text = "閲嶉噺涓嬮檺";
this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_checkDate;
- this.layoutControlItem23.Location = new System.Drawing.Point(604, 93);
+ this.layoutControlItem23.Location = new System.Drawing.Point(587, 93);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 4;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(151, 31);
+ this.layoutControlItem23.Size = new System.Drawing.Size(147, 31);
this.layoutControlItem23.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_checkBy;
- this.layoutControlItem22.Location = new System.Drawing.Point(604, 62);
+ this.layoutControlItem22.Location = new System.Drawing.Point(587, 62);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 4;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(151, 31);
+ this.layoutControlItem22.Size = new System.Drawing.Size(147, 31);
this.layoutControlItem22.Text = "瀹℃牳浜哄憳";
this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem8
+ // layoutControlItem21
//
- this.layoutControlItem8.Control = this.txt_fCapacity;
- this.layoutControlItem8.CustomizationFormText = "鏍囧噯浜ц兘(PCS?H)";
- this.layoutControlItem8.Location = new System.Drawing.Point(453, 62);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(151, 31);
- this.layoutControlItem8.Text = "鏍囧噯浜ц兘";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_fBegDate;
- this.layoutControlItem4.Location = new System.Drawing.Point(302, 93);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(302, 31);
- this.layoutControlItem4.Text = "鐢熸晥鏃ユ湡";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_remark;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 93);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(302, 31);
- this.layoutControlItem12.Text = "娴佺▼鎻忚堪";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem21.Control = this.txt_lastUpdateDate;
+ this.layoutControlItem21.Location = new System.Drawing.Point(587, 31);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem21.Size = new System.Drawing.Size(147, 31);
+ this.layoutControlItem21.Text = "鏇存柊鏃堕棿";
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.btnSelect;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem15.MaxSize = new System.Drawing.Size(100, 31);
this.layoutControlItem15.MinSize = new System.Drawing.Size(90, 31);
this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem15.Size = new System.Drawing.Size(151, 33);
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(146, 31);
this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem15.Text = "閫夋嫨宸ュ簭";
this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
@@ -940,25 +870,38 @@
// layoutControlItem10
//
this.layoutControlItem10.Control = this.btnCopy;
- this.layoutControlItem10.Location = new System.Drawing.Point(151, 124);
+ this.layoutControlItem10.Location = new System.Drawing.Point(146, 93);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem10.Size = new System.Drawing.Size(151, 33);
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem10.Size = new System.Drawing.Size(147, 31);
this.layoutControlItem10.Text = "澶嶅埗";
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
//
- // layoutControlItem21
+ // layoutControlItem25
//
- this.layoutControlItem21.Control = this.txt_lastUpdateDate;
- this.layoutControlItem21.Location = new System.Drawing.Point(604, 31);
- this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(151, 31);
- this.layoutControlItem21.Text = "鏇存柊鏃堕棿";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem25.Control = this.txt_isCheck;
+ this.layoutControlItem25.Location = new System.Drawing.Point(440, 62);
+ this.layoutControlItem25.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem25.Size = new System.Drawing.Size(147, 31);
+ this.layoutControlItem25.Text = "瀹℃牳鐘舵��";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem25.TextVisible = false;
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_remark;
+ this.layoutControlItem12.Location = new System.Drawing.Point(293, 93);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem12.Size = new System.Drawing.Size(294, 31);
+ this.layoutControlItem12.Text = "娴佺▼鎻忚堪";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
// tabMx
//
@@ -966,7 +909,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(775, 443);
+ this.tabMx.Size = new System.Drawing.Size(775, 480);
this.tabMx.TabIndex = 4;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -975,7 +918,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(773, 411);
+ this.tabMxPage1.Size = new System.Drawing.Size(773, 448);
this.tabMxPage1.Text = "宸ュ簭淇℃伅";
//
// gcMx1
@@ -992,7 +935,7 @@
this.repositoryItemComboBox1,
this.repositoryItemComboBox2,
this.rptGx});
- this.gcMx1.Size = new System.Drawing.Size(773, 411);
+ this.gcMx1.Size = new System.Drawing.Size(773, 448);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1203,6 +1146,28 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_fJingDu;
+ this.layoutControlItem3.Location = new System.Drawing.Point(293, 0);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem3.Size = new System.Drawing.Size(147, 31);
+ this.layoutControlItem3.Text = "绠＄悊绮惧害";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_fCapacity;
+ this.layoutControlItem8.CustomizationFormText = "鏍囧噯浜ц兘";
+ this.layoutControlItem8.Location = new System.Drawing.Point(293, 31);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem8.Size = new System.Drawing.Size(147, 31);
+ this.layoutControlItem8.Text = "鏍囧噯浜ц兘";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ //
// Frm_WorkTechnique
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1246,7 +1211,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fEndDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_orgName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateDate.Properties)).EndInit();
@@ -1257,25 +1221,22 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1286,6 +1247,8 @@
((System.ComponentModel.ISupportInitialize)(this.rptGx)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
this.ResumeLayout(false);
}
@@ -1328,7 +1291,6 @@
private DevExpress.XtraEditors.DateEdit txt_fBegDate;
private DevExpress.XtraEditors.DateEdit txt_fEndDate;
private DevExpress.XtraEditors.TextEdit txt_orgName;
- private DevExpress.XtraEditors.ComboBoxEdit txt_fType;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
@@ -1349,23 +1311,22 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptGx;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraEditors.SimpleButton btnCopy;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
index 92bdf28..5d4a559 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -250,23 +250,25 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- if (txt_fType.SelectedIndex <0)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鐢熶骇绫诲瀷涓嶈兘涓虹┖锛�");
- txt_fType.Focus();
- return;
- }
+ //if (txt_fType.SelectedIndex <0)
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.ShowError("鐢熶骇绫诲瀷涓嶈兘涓虹┖锛�");
+ // txt_fType.Focus();
+ // return;
+ //}
if (txt_fJingDu.SelectedIndex < 0)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("绠＄悊绮惧害涓嶈兘涓虹┖锛�");
txt_fJingDu.Focus(); return;
}
+ txt_fBegDate.DateTime = new DateTime(2025, 1, 1);
+ txt_fEndDate.DateTime = new DateTime(2099, 1, 1);
+ txt_fSumPeople.Text = "0";
if (txt_fBegDate.Text.Length <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("鐢熸晥鏃ユ湡涓嶈兘涓虹┖锛�");
txt_fBegDate.Focus(); return;
}
- txt_fEndDate.DateTime= new DateTime(2099, 1, 1);
if (txt_fEndDate.Text.Length > 0 && txt_fBegDate.DateTime > txt_fEndDate.DateTime)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("鐢熸晥鏃ユ湡涓嶈兘澶т簬澶辨晥鏃ユ湡锛�");
@@ -303,7 +305,8 @@
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- fType = txt_fType.Text.Trim(),
+ // fType = txt_fType.Text.Trim(),
+ fType = "F-閲忎骇", //F - 閲忎骇S - 璇曚綔
fBegDate = txt_fBegDate.Text.Trim(),
fEndDate = txt_fEndDate.Text.Trim(),
fJingDu = txt_fJingDu.Text.Trim(),
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 3d20e99..0c62eff 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1038,6 +1038,12 @@
<Compile Include="DevFrm\WOM\Frm_WomFanGong.Designer.cs">
<DependentUpon>Frm_WomFanGong.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\WOM\ShowGx.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WOM\ShowGx.Designer.cs">
+ <DependentUpon>ShowGx.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\WOM\ShowJieAn.cs">
<SubType>Form</SubType>
</Compile>
@@ -1895,6 +1901,9 @@
<EmbeddedResource Include="DevFrm\WOM\Frm_WomFanGong.resx">
<DependentUpon>Frm_WomFanGong.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WOM\ShowGx.resx">
+ <DependentUpon>ShowGx.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\WOM\ShowJieAn.resx">
<DependentUpon>ShowJieAn.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 4b44e1d..af7c710 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -63,6 +63,9 @@
this.btnShouHouFchk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnCaiWuChk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnCaiWuFchk = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnAll = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnGongZi = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnLianBan = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnLayout = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnFont = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -70,9 +73,7 @@
this.barLargeButtonItem2 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem3 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem4 = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnAll = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnGongZi = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnLianBan = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnGx = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -132,9 +133,10 @@
this.btnFPiZhun,
this.btnAll,
this.btnGongZi,
- this.btnLianBan});
+ this.btnLianBan,
+ this.btnGx});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 71;
+ this.barManager1.MaxItemId = 72;
//
// bar2
//
@@ -177,16 +179,17 @@
new DevExpress.XtraBars.LinkPersistInfo(this.btnShouHouFchk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuChk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuFchk),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnAll),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnGongZi),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnLianBan),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnGx),
new DevExpress.XtraBars.LinkPersistInfo(this.btnLayout),
new DevExpress.XtraBars.LinkPersistInfo(this.btnFont),
new DevExpress.XtraBars.LinkPersistInfo(this.btnHelp),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem1),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem2),
new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem3),
- new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem4),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnAll),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnGongZi),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnLianBan)});
+ new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem4)});
this.bar2.OptionsBar.DrawBorder = false;
this.bar2.OptionsBar.DrawDragBorder = false;
this.bar2.OptionsBar.MultiLine = true;
@@ -489,6 +492,33 @@
this.btnCaiWuFchk.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnCaiWuFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // btnAll
+ //
+ this.btnAll.Caption = "鎵归噺璁剧疆";
+ this.btnAll.Id = 67;
+ this.btnAll.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.dayview_16x16;
+ this.btnAll.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.dayview_32x32;
+ this.btnAll.Name = "btnAll";
+ this.btnAll.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // btnGongZi
+ //
+ this.btnGongZi.Caption = "璁＄畻宸ヨ祫";
+ this.btnGongZi.Id = 69;
+ this.btnGongZi.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnGongZi.ImageOptions.Image")));
+ this.btnGongZi.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnGongZi.ImageOptions.LargeImage")));
+ this.btnGongZi.Name = "btnGongZi";
+ this.btnGongZi.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // btnLianBan
+ //
+ this.btnLianBan.Caption = "璁剧疆杩炵彮";
+ this.btnLianBan.Id = 70;
+ this.btnLianBan.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnLianBan.ImageOptions.Image")));
+ this.btnLianBan.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnLianBan.ImageOptions.LargeImage")));
+ this.btnLianBan.Name = "btnLianBan";
+ this.btnLianBan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// btnLayout
//
this.btnLayout.Caption = "鐗堥潰";
@@ -557,32 +587,14 @@
this.barLargeButtonItem4.Tag = "Never";
this.barLargeButtonItem4.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
- // btnAll
+ // btnGx
//
- this.btnAll.Caption = "鎵归噺璁剧疆";
- this.btnAll.Id = 67;
- this.btnAll.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.dayview_16x16;
- this.btnAll.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.dayview_32x32;
- this.btnAll.Name = "btnAll";
- this.btnAll.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
- //
- // btnGongZi
- //
- this.btnGongZi.Caption = "璁＄畻宸ヨ祫";
- this.btnGongZi.Id = 69;
- this.btnGongZi.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnGongZi.ImageOptions.Image")));
- this.btnGongZi.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnGongZi.ImageOptions.LargeImage")));
- this.btnGongZi.Name = "btnGongZi";
- this.btnGongZi.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
- //
- // btnLianBan
- //
- this.btnLianBan.Caption = "璁剧疆杩炵彮";
- this.btnLianBan.Id = 70;
- this.btnLianBan.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnLianBan.ImageOptions.Image")));
- this.btnLianBan.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnLianBan.ImageOptions.LargeImage")));
- this.btnLianBan.Name = "btnLianBan";
- this.btnLianBan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ this.btnGx.Caption = "宸ュ簭鍙樻洿";
+ this.btnGx.Id = 71;
+ this.btnGx.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnGx.ImageOptions.Image")));
+ this.btnGx.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnGx.ImageOptions.LargeImage")));
+ this.btnGx.Name = "btnGx";
+ this.btnGx.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
// barDockControlTop
//
@@ -590,13 +602,13 @@
this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
this.barDockControlTop.Manager = this.barManager1;
- this.barDockControlTop.Size = new System.Drawing.Size(1543, 142);
+ this.barDockControlTop.Size = new System.Drawing.Size(1543, 213);
//
// barDockControlBottom
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 69);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 67);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -604,7 +616,7 @@
//
this.barDockControlLeft.CausesValidation = false;
this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
- this.barDockControlLeft.Location = new System.Drawing.Point(0, 142);
+ this.barDockControlLeft.Location = new System.Drawing.Point(0, 213);
this.barDockControlLeft.Manager = this.barManager1;
this.barDockControlLeft.Size = new System.Drawing.Size(0, 0);
//
@@ -612,7 +624,7 @@
//
this.barDockControlRight.CausesValidation = false;
this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
- this.barDockControlRight.Location = new System.Drawing.Point(1543, 142);
+ this.barDockControlRight.Location = new System.Drawing.Point(1543, 213);
this.barDockControlRight.Manager = this.barManager1;
this.barDockControlRight.Size = new System.Drawing.Size(0, 0);
//
@@ -625,7 +637,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 69);
+ this.Size = new System.Drawing.Size(1543, 67);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -679,5 +691,6 @@
private DevExpress.XtraBars.BarLargeButtonItem btnAll;
private DevExpress.XtraBars.BarLargeButtonItem btnGongZi;
private DevExpress.XtraBars.BarLargeButtonItem btnLianBan;
+ private DevExpress.XtraBars.BarLargeButtonItem btnGx;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index dc8dd2f..ddf426e 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -59,6 +59,7 @@
btnAll.ItemClick += BtnAll_ItemClick;
btnGongZi.ItemClick += BtnGongZi_ItemClick;
btnLianBan.ItemClick += BtnLianBan_ItemClick;
+ btnGx.ItemClick += BtnGx_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -66,6 +67,8 @@
lst.Add(item.Caption);
actions = lst;
}
+
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
@@ -380,7 +383,11 @@
if (btnGongZiClick != null)
btnGongZiClick(this, e);
}
-
+ private void BtnGx_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnGxClick != null)
+ btnGxClick(this, e);
+ }
/// <summary>
/// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
@@ -996,6 +1003,11 @@
/// </summary>
public event EventHandler btnGongZiClick;
+ /// <summary>
+ /// 宸ュ簭鍙樻洿
+ /// </summary>
+ public event EventHandler btnGxClick;
+
#endregion
#region 鍏叡灞炴��
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
index 5dacf19..0fcfa3b 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
@@ -436,4 +436,67 @@
go35SOLV4IF5ZizSkuBzwnCZ64VwHW8lieRPWWK6xQBRdLsAAAAASUVORK5CYII=
</value>
</data>
+ <data name="btnGx.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAldEVYdFRpdGxlAEZ1bmN0aW9uc0RhdGVBbmRUaW1lO0Z1bmN0aW9uczuCdFjGAAACwklEQVQ4
+ T3WT+0uTURjHvV/S/o6IEmkFaaZiSiqSl9rUZqa5HJnammnLwNLpFKIfrIwCS6qpuUJKMVxauomX4S0N
+ S+c2Z22a1kTRzUy3fTvnzWIqvfCBw3Pe74fzPIfjBMBp83MmuGzD9T/QPWcmuylw1pWXdk5XSKAvL4Ne
+ UgadpBRTZWJoKaWUYmjFxdCUFGP8RpGCihwFLhqxGIs9PbDb7bBabfi1bsXq2jpWLGtYWv4J09Iq5hfM
+ +GZaxlhhIQ25OQpcP4tEGL9agE/5+RgTCvHxkgAjObkYvpCNQX4W+nl8qNJ56Es9h+EcAQ25OwrcRoV5
+ sAx2YnWwA5aBd3/obye0waJqg1n1FuZeOcw9rRjgX6Qhjy2CD9m5MPfJ8f1RBQyVN6E8zUVTWBSaw6Kh
+ 5KbAcKcEc1XFWHjxAL3kJCTj6ShwV53LxHLHa+grRCQYg9GXLbCQ/il0TWv6W9fx41kllJyUnYJubhoW
+ Xz2BMikZ3VU12CCD/Ptt2GzovlcDBScJcw8r0B7LpiEvsvVP4KFgc2GS3kdzaCTUagMaAkJRywqCKDyR
+ kU2ov6Ip5DhpQwJ5VDwNeTsKPN/HJWK++jbTs05jxDy5NqvNjlOp15i1Vmsk8ijMkvm0HIvZKZBHJ2D2
+ bgnpLxFD1VIYF1YwQ0jgFsBoWsHQ4zooTrJhKCczComkoV2OAq83ESdgIANUC3hoJbKRpzIY9bMw6Gcw
+ Stat0fHM3nRhFhoDwmnIx1Hg3USO96UoF5psLibzMtFFTiKPiiXEoYvNweTlDOgEadBkJUN2MJSGfLcI
+ GgMjMHWFh0k+B+rzbGhzuNAJM5iaVnCWqY+ficFEejzq/Y7sEHjUsoI7ZKxQyFghaDgQjOf+R1HvH8T8
+ XOcXiLr9gZDuC4B072FU7zlEH9OWa6TP05PgQ/Ddxu5t0JoXwQWA0292ED6Rmga6ogAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <data name="btnGx.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAldEVYdFRpdGxlAEZ1bmN0aW9uc0RhdGVBbmRUaW1lO0Z1bmN0aW9uczuCdFjGAAAIrElEQVRY
+ R7WXCVRU1xnHbZs2bdLsiYmmbZK2aWMquCE7siMurAPMsG8Oi+yI0QRFRauJMRKjaFwqoiIgAhJkccGD
+ exGGYcdhX2TfURBNz/n3+x6DxzRDOT09eef8znfn3jv3///uve++92YBmMXXFYlk1hWxhIs/U/Lzn4Cp
+ sYVL0J4ycMnxqfgviF8Rv1bymxl4YQZeVEYe65fElJEfGqCLK587vXL18hyRQ8lFkSOmkIUHE0GQhQWh
+ 5FlCmbUCxUwIEzgZgwNxl8p3OQYF4nagvyzDzWUFabAJlQbY2fN5dqKe4xp6qL9+B0MPH/1PDD4Yn5aO
+ snLcDpD2kAbPGmupNPBCloUF4tQXI/dQIkoVLSi91wa5MspqKNY0Q3avRSjLqFxcPcndZ+DfRRWNKKoi
+ KHJdhaIVN6S+LPYSwcv8IwNc+eJ5cwtcdnZGnq0dcpWUR4WjLCrsKfKoUMjXUTmSypFUJkojKEaEUCTC
+ QyaXLWyKINzaHIOrvl4s9jLxHAuqMvDbdFMztB/9Fu0HD6Dt4H40x32FBzdzMFpwDiOXmbMYucikYiQ/
+ GSN5ZzCcm4ThHOLCaQxnn8TQd4kYyiLOJ2Ao8ziGMo6h49he/DPQn8VeIaY3cM7YBC1f70W5v1RA5uOJ
+ gdP70Hdsl5Kd6Du6E73MkSn+jp7DzI5Jvt3+lO5DFA/Foj85HkUBfiz2KjGtgZfSDI3RtGc35Gt8USZd
+ gxIvd/SfjFMtIgyu5GAssQ098dvQTfQc2IruA1sm2b8FfYlxuEPjkcZ/NfByqoEhGj7fhVIfL8i8vVDk
+ 7oq+E3sEgW4S6D5IAxMVn6zFFYkD0k0tcGKBNkVzXBE70H4JRNc3Mejax2wmNqHz603oPb4HN319WOw1
+ QqUBrnwlRc8Aih3bUezhIXDHxRm9x76gLGIEWndvRK61FVKsxShMykRxSS3KmnuFyL9TrMTItbFGy84o
+ dH61ER3MlxvQc2QXrnsJm/B1gs8C1QaSdPVRu2ULilxdBG6JxeimP3fGRaNhWwSS9U2Rt2Mvqpu60TM8
+ htHxx5h48i+MUOwZGqP6HuRTe7I+LWVsBO7vjkL7F1Hoit+OQncPFnuDmNbAq6e1dVH1WTTuOEtwW+KM
+ 6w4idNH0t+/5BJlmFrh68AQU9wcxPvE9Hj3+HuPPQnUPHz0R2guoX569Pdo/X4e2neHooCW56uI6o4HX
+ TmnqQhYSipuOjoQTCm1t0bl/K0qCvJDhJkVVaz+dehMYYzGl4AMlssoGeATEYuDBBKpa+qn/GshCpWjZ
+ FoyW7RG0RyQs9iYhHMeqDLyeqKGDIr8AXLZciWt29iiwssb9vdHIo3W/SWtc2z4oiArCNO28BExxeR3c
+ /bai8HYZ6prahH43qH+enR2aogPQtDkIlxycWOwtQqUBrnwjYYkmbvtIkU+7O99sOS5arED7lxtxdpkp
+ KirqUdcxSGf7I0F0ZOwxDiech53rBthIwpFz+RYUja3o7BuCgvpVltcjzdAMjZvWouEzfzIjYrHZSi3V
+ Bv6xaCluefog18QcucbmOG9ghJbYMJzRMUJday8yjS2QorUMJ9S0cOTDBbAXR6KktBYit424kH8ZXf3D
+ aOsdRUPXkNA/RY82Y0wwGjb40t1jz2JvE/y4V2ngzWMLNXDD1RMXjMxwwdAUmXqGNEAQ0km4proRzT0j
+ uFuhgKyqDlWKRsTsiKfs1yM6dj+u3riD+/0P0EoGuF9NdRMyTC3RRDNQv84b2atspjXAz2c28NZR9SW4
+ JnFH9jITfEec0zagAQJxyd4WJek5QnYs0jX4EN2D42hs64amgRUysvNR39qNTqrndu5Xkn4Blxwd0Pip
+ P+rC3ZFluZrF3iGmNTD7iNpiFDi6IIvu4ywDY6Rp66PhUz8US92QHxCKjoFRQbx3aBy9o+MYIOxpD1TT
+ bPRRuXd4nNrH0EEm8gPpKRmyRsj+XrAzMs1XstgcQqUBrnz78PxFuGIvxnk9I5p+I6TSbdmwQQpFhBfy
+ bGxRlpopiPeTGG/GobEJ2DqvR219MwZHJ4R6NlF2NhMFdJY00vrXrpWgJtAJ6SaWLDZXqaXawKGPF+Ci
+ tQgZOssEUpbqoD7KF7U0QE2EN3Js7FGacAoDI+MYpruA7wZr8Tph9/NdMTAyBjm159jaoy46BIpQN1R5
+ W6PGT4Q0I3MWe5d4njVVGXgnfp468lfb4ZyWgcCZJdqoi/SiARxwL1AMxXoprrm5oCAgGI0F1zDY1UuH
+ 0hPUyCuE3wWBwSh0dUZDTDjqI70F8UqP1aj0tkWqvsmMBubEf6SGHEsrpGnqI22pPpIWadEG8kD1GntU
+ +9ihWiqi5fBEeZgUhWSE35yyV1kLsdDNGRWR/nTohNKau5KwFSrcV6LcZSUq3VcjWceYxX5HTGtg7v6/
+ qCHbbBVSNXQJPZxauJQGc0Oljw0qvWxQ5UUZeVqTEQdhZho3h6CZHjrNWyPQGL0WijAP6mtLoisEypyX
+ C3A5ScuQxX5PqDTAle9+8+F8ZBmvQPJiXUIHiepLaRNRZp6UDU0lw9lUuK0iVqDClTJ0ZTFLgoScLVEm
+ IVGJBcrEhJO5Eguc0tCf0cDcfX/+GBnLLGjqtQUS5i9Bjb/TpCAJMZPZkRAJTooth1zMmAuUOZmhzNEM
+ ckdTyB3MUCoyQamDKRIX6U4Z4I8UlUswe/ef5vUn0donL9FDEr3pJMzXQLUfGXgqagn5VJaUoZwylTsy
+ JM6iJCQXmUEmMkWpHQnbGUNGFC43wBE1zQHSmPYg4qfhy0Fz3vPa88FH/XF/nAeBD+bhJJk5tZjRxUmK
+ iRwpm8RFtEQLdemVTEcggQyfUCfTbFxdC8cZNU0cn6+Jo3/T7I96/68+pDH1VvwDA3yxCT4N+b2dz2ve
+ rX+Yhvdm4P3/gP/DJyCLc/Yqv4zYADfwyyl34j0x9YH6/8JjMTw2a7DWjwxMXdz4U/L0AjDr39du2XFQ
+ vnqQAAAAAElFTkSuQmCC
+</value>
+ </data>
</root>
\ No newline at end of file
--
Gitblit v1.9.3