From c7bf48f709dbddd7744c2d005686606bc168a88a Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 25 十月 2025 09:13:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 1129 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 623 insertions(+), 506 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 0380645..4e277bb 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -30,6 +30,11 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -51,20 +56,29 @@
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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Womdaa));
+ 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 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.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
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.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = 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();
@@ -86,7 +100,6 @@
this.gv_daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_daa011 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa005 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -94,8 +107,6 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa015 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa009 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_prepareTime = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_daa028 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa016 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa017 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_mesStartProd = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -105,6 +116,9 @@
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn66 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -116,11 +130,9 @@
this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
this.txt_daa008 = new DevExpress.XtraEditors.TextEdit();
this.txt_saleOrderNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_mesStartProd = new DevExpress.XtraEditors.TextEdit();
this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
this.txt_daa022Remark = new DevExpress.XtraEditors.TextEdit();
this.txt_daa010 = new DevExpress.XtraEditors.TextEdit();
- this.txt_mesEndProd = new DevExpress.XtraEditors.TextEdit();
this.txt_daa011 = new DevExpress.XtraEditors.TextEdit();
this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
this.txt_daa016 = new DevExpress.XtraEditors.TextEdit();
@@ -135,6 +147,9 @@
this.txt_isQiTao = new DevExpress.XtraEditors.CheckEdit();
this.txt_daa018 = new DevExpress.XtraEditors.TextEdit();
this.txt_daa025 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_daa021 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_mesStartProd = new DevExpress.XtraEditors.DateEdit();
+ this.txt_mesEndProd = new DevExpress.XtraEditors.DateEdit();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -147,21 +162,22 @@
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = 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.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.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem49 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_mesStartProd123 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -194,6 +210,9 @@
this.gvMx1dab020 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab022 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab023 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn58 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.btnXls = new DevExpress.XtraEditors.SimpleButton();
this.xtraTabPage6 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx6 = new DevExpress.XtraGrid.GridControl();
this.gvMx6 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -214,19 +233,17 @@
this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn63 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn64 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn65 = 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();
@@ -271,6 +288,8 @@
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptTuoBanNbz = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx98 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx98 = new DevExpress.XtraLayout.LayoutControl();
@@ -297,6 +316,7 @@
this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx100 = new DevExpress.XtraEditors.SplitContainerControl();
this.layMx100 = new DevExpress.XtraDataLayout.DataLayoutControl();
@@ -328,7 +348,6 @@
this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -339,6 +358,7 @@
this.split1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
@@ -353,11 +373,9 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa022Remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa010.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa016.Properties)).BeginInit();
@@ -372,6 +390,11 @@
((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.txt_daa021.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties.CalendarTimeProperties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
@@ -384,26 +407,28 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).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.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.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem49)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd123)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).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.panel1.SuspendLayout();
this.xtraTabPage6.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx6)).BeginInit();
@@ -446,6 +471,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptTuoBanNbz)).BeginInit();
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx98)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).BeginInit();
@@ -558,6 +584,8 @@
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
+ this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1});
this.gcMain1.Size = new System.Drawing.Size(1650, 657);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -584,7 +612,6 @@
this.gv_daa003,
this.gv_daa004,
this.gv_daa008,
- this.gv_daa011,
this.gridColumn4,
this.gv_daa010,
this.gv_daa005,
@@ -592,8 +619,6 @@
this.gridColumn1,
this.gv_daa015,
this.gv_daa009,
- this.gv_prepareTime,
- this.gv_daa028,
this.gv_daa016,
this.gv_daa017,
this.gv_mesStartProd,
@@ -603,7 +628,8 @@
this.gridColumn23,
this.gridColumn24,
this.gridColumn25,
- this.gridColumn52});
+ this.gridColumn52,
+ this.gridColumn66});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -619,8 +645,6 @@
this.gridColumn5.MinWidth = 50;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "query_a.jabs";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 0;
this.gridColumn5.Width = 50;
//
// gridColumn7
@@ -655,8 +679,6 @@
this.gridColumn12.MinWidth = 50;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Tag = "query_a.jabs";
- this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 3;
this.gridColumn12.Width = 50;
//
// gridColumn6
@@ -668,7 +690,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Tag = "query_a.jabs";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 4;
+ this.gridColumn6.VisibleIndex = 3;
this.gridColumn6.Width = 50;
//
// gridColumn27
@@ -678,20 +700,20 @@
this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.Visible = true;
- this.gridColumn27.VisibleIndex = 19;
+ this.gridColumn27.VisibleIndex = 18;
this.gridColumn27.Width = 94;
//
// gv_daa018
//
this.gv_daa018.AppearanceCell.Options.UseFont = true;
this.gv_daa018.Caption = "宸ュ崟鐘舵��";
- this.gv_daa018.FieldName = "daa018Txt";
+ this.gv_daa018.FieldName = "daa018TxtColor";
this.gv_daa018.MinWidth = 90;
this.gv_daa018.Name = "gv_daa018";
this.gv_daa018.OptionsColumn.AllowEdit = false;
this.gv_daa018.Tag = "query_a.daa018";
this.gv_daa018.Visible = true;
- this.gv_daa018.VisibleIndex = 5;
+ this.gv_daa018.VisibleIndex = 4;
this.gv_daa018.Width = 90;
//
// gridColoun100
@@ -702,7 +724,7 @@
this.gridColoun100.Name = "gridColoun100";
this.gridColoun100.Tag = "org.fnamber";
this.gridColoun100.Visible = true;
- this.gridColoun100.VisibleIndex = 29;
+ this.gridColoun100.VisibleIndex = 26;
this.gridColoun100.Width = 250;
//
// gv_daa001
@@ -715,7 +737,7 @@
this.gv_daa001.OptionsColumn.AllowEdit = false;
this.gv_daa001.Tag = "query_a.daa001";
this.gv_daa001.Visible = true;
- this.gv_daa001.VisibleIndex = 6;
+ this.gv_daa001.VisibleIndex = 8;
this.gv_daa001.Width = 120;
//
// gv_daa021
@@ -728,7 +750,7 @@
this.gv_daa021.OptionsColumn.AllowEdit = false;
this.gv_daa021.Tag = "query_a.daa021";
this.gv_daa021.Visible = true;
- this.gv_daa021.VisibleIndex = 7;
+ this.gv_daa021.VisibleIndex = 20;
this.gv_daa021.Width = 100;
//
// gridColumn3
@@ -738,7 +760,7 @@
this.gridColumn3.MinWidth = 50;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 10;
+ this.gridColumn3.VisibleIndex = 11;
this.gridColumn3.Width = 94;
//
// gv_daa003
@@ -751,7 +773,7 @@
this.gv_daa003.OptionsColumn.AllowEdit = false;
this.gv_daa003.Tag = "query_a.daa003";
this.gv_daa003.Visible = true;
- this.gv_daa003.VisibleIndex = 11;
+ this.gv_daa003.VisibleIndex = 12;
this.gv_daa003.Width = 150;
//
// gv_daa004
@@ -764,7 +786,7 @@
this.gv_daa004.OptionsColumn.AllowEdit = false;
this.gv_daa004.Tag = "query_a.daa004";
this.gv_daa004.Visible = true;
- this.gv_daa004.VisibleIndex = 12;
+ this.gv_daa004.VisibleIndex = 15;
this.gv_daa004.Width = 150;
//
// gv_daa008
@@ -778,22 +800,8 @@
this.gv_daa008.OptionsColumn.AllowEdit = false;
this.gv_daa008.Tag = "query_a.daa008";
this.gv_daa008.Visible = true;
- this.gv_daa008.VisibleIndex = 13;
+ this.gv_daa008.VisibleIndex = 5;
this.gv_daa008.Width = 50;
- //
- // gv_daa011
- //
- this.gv_daa011.AppearanceCell.Options.UseFont = true;
- this.gv_daa011.Caption = "宸茬敓浜ч噺";
- this.gv_daa011.FieldName = "daa011";
- this.gv_daa011.MaxWidth = 50;
- this.gv_daa011.MinWidth = 50;
- this.gv_daa011.Name = "gv_daa011";
- this.gv_daa011.OptionsColumn.AllowEdit = false;
- this.gv_daa011.Tag = "query_a.daa011";
- this.gv_daa011.Visible = true;
- this.gv_daa011.VisibleIndex = 14;
- this.gv_daa011.Width = 50;
//
// gridColumn4
//
@@ -801,19 +809,19 @@
this.gridColumn4.AppearanceCell.Options.UseForeColor = true;
this.gridColumn4.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
this.gridColumn4.AppearanceHeader.Options.UseForeColor = true;
- this.gridColumn4.Caption = "寰呯敓浜ч噺";
+ this.gridColumn4.Caption = "寰呭叆搴撻噺";
this.gridColumn4.FieldName = "dscl";
this.gridColumn4.MaxWidth = 50;
this.gridColumn4.MinWidth = 50;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 15;
+ this.gridColumn4.VisibleIndex = 7;
this.gridColumn4.Width = 50;
//
// gv_daa010
//
this.gv_daa010.AppearanceCell.Options.UseFont = true;
- this.gv_daa010.Caption = "鍏ュ簱鏁伴噺";
+ this.gv_daa010.Caption = "宸插叆搴撻噺";
this.gv_daa010.FieldName = "daa010";
this.gv_daa010.MaxWidth = 50;
this.gv_daa010.MinWidth = 50;
@@ -821,7 +829,7 @@
this.gv_daa010.OptionsColumn.AllowEdit = false;
this.gv_daa010.Tag = "query_a.daa010";
this.gv_daa010.Visible = true;
- this.gv_daa010.VisibleIndex = 17;
+ this.gv_daa010.VisibleIndex = 6;
this.gv_daa010.Width = 50;
//
// gv_daa005
@@ -835,7 +843,7 @@
this.gv_daa005.OptionsColumn.AllowEdit = false;
this.gv_daa005.Tag = "query_a.daa005";
this.gv_daa005.Visible = true;
- this.gv_daa005.VisibleIndex = 18;
+ this.gv_daa005.VisibleIndex = 17;
this.gv_daa005.Width = 50;
//
// gv_cust
@@ -856,7 +864,7 @@
this.gridColumn1.MinWidth = 50;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 20;
+ this.gridColumn1.VisibleIndex = 19;
this.gridColumn1.Width = 94;
//
// gv_daa015
@@ -869,7 +877,7 @@
this.gv_daa015.OptionsColumn.AllowEdit = false;
this.gv_daa015.Tag = "query_a.daa015";
this.gv_daa015.Visible = true;
- this.gv_daa015.VisibleIndex = 8;
+ this.gv_daa015.VisibleIndex = 9;
this.gv_daa015.Width = 94;
//
// gv_daa009
@@ -885,28 +893,6 @@
this.gv_daa009.VisibleIndex = 16;
this.gv_daa009.Width = 94;
//
- // gv_prepareTime
- //
- this.gv_prepareTime.AppearanceCell.Options.UseFont = true;
- this.gv_prepareTime.Caption = "棰勮澶囨枡鏃堕棿";
- this.gv_prepareTime.FieldName = "prepareTime";
- this.gv_prepareTime.MinWidth = 50;
- this.gv_prepareTime.Name = "gv_prepareTime";
- this.gv_prepareTime.OptionsColumn.AllowEdit = false;
- this.gv_prepareTime.Tag = "query_a.prepare_time";
- this.gv_prepareTime.Width = 180;
- //
- // gv_daa028
- //
- this.gv_daa028.AppearanceCell.Options.UseFont = true;
- this.gv_daa028.Caption = "澶囨枡瀹屾垚鏃堕棿";
- this.gv_daa028.FieldName = "daa028";
- this.gv_daa028.MinWidth = 50;
- this.gv_daa028.Name = "gv_daa028";
- this.gv_daa028.OptionsColumn.AllowEdit = false;
- this.gv_daa028.Tag = "query_a.daa028";
- this.gv_daa028.Width = 180;
- //
// gv_daa016
//
this.gv_daa016.AppearanceCell.Options.UseFont = true;
@@ -917,7 +903,7 @@
this.gv_daa016.OptionsColumn.AllowEdit = false;
this.gv_daa016.Tag = "query_a.daa016";
this.gv_daa016.Visible = true;
- this.gv_daa016.VisibleIndex = 21;
+ this.gv_daa016.VisibleIndex = 22;
this.gv_daa016.Width = 180;
//
// gv_daa017
@@ -929,8 +915,6 @@
this.gv_daa017.Name = "gv_daa017";
this.gv_daa017.OptionsColumn.AllowEdit = false;
this.gv_daa017.Tag = "query_a.daa017";
- this.gv_daa017.Visible = true;
- this.gv_daa017.VisibleIndex = 22;
this.gv_daa017.Width = 180;
//
// gv_mesStartProd
@@ -943,7 +927,7 @@
this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
this.gv_mesStartProd.Visible = true;
- this.gv_mesStartProd.VisibleIndex = 23;
+ this.gv_mesStartProd.VisibleIndex = 13;
this.gv_mesStartProd.Width = 180;
//
// gv_mesEndProd
@@ -956,7 +940,7 @@
this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
this.gv_mesEndProd.Visible = true;
- this.gv_mesEndProd.VisibleIndex = 24;
+ this.gv_mesEndProd.VisibleIndex = 14;
this.gv_mesEndProd.Width = 180;
//
// gridColumn21
@@ -966,7 +950,7 @@
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 25;
+ this.gridColumn21.VisibleIndex = 23;
this.gridColumn21.Width = 94;
//
// gridColumn22
@@ -976,7 +960,7 @@
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 26;
+ this.gridColumn22.VisibleIndex = 24;
this.gridColumn22.Width = 94;
//
// gridColumn23
@@ -994,7 +978,7 @@
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 27;
+ this.gridColumn24.VisibleIndex = 25;
this.gridColumn24.Width = 94;
//
// gridColumn25
@@ -1004,8 +988,47 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 28;
+ this.gridColumn25.VisibleIndex = 21;
this.gridColumn25.Width = 94;
+ //
+ // gridColumn52
+ //
+ this.gridColumn52.Caption = "鐢熶骇绫诲瀷";
+ this.gridColumn52.FieldName = "daa025";
+ this.gridColumn52.MinWidth = 25;
+ this.gridColumn52.Name = "gridColumn52";
+ this.gridColumn52.Visible = true;
+ this.gridColumn52.VisibleIndex = 10;
+ this.gridColumn52.Width = 94;
+ //
+ // gridColumn66
+ //
+ this.gridColumn66.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn66.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn66.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn66.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn66.Caption = "杩涘叆鐪嬫澘";
+ this.gridColumn66.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gridColumn66.MinWidth = 25;
+ this.gridColumn66.Name = "gridColumn66";
+ this.gridColumn66.Visible = true;
+ this.gridColumn66.VisibleIndex = 0;
+ this.gridColumn66.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.repositoryItemButtonEdit1.Appearance.Options.UseForeColor = true;
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.boposition2_16x161;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ serializableAppearanceObject1.ForeColor = System.Drawing.Color.Blue;
+ serializableAppearanceObject1.Options.UseForeColor = true;
+ 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);
//
// pageBar1
//
@@ -1044,7 +1067,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1650, 708);
- this.splitMx1.SplitterPosition = 192;
+ this.splitMx1.SplitterPosition = 200;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -1056,11 +1079,9 @@
this.layoutMx1.Controls.Add(this.txt_daa001);
this.layoutMx1.Controls.Add(this.txt_daa008);
this.layoutMx1.Controls.Add(this.txt_saleOrderNo);
- this.layoutMx1.Controls.Add(this.txt_mesStartProd);
this.layoutMx1.Controls.Add(this.txt_daa014);
this.layoutMx1.Controls.Add(this.txt_daa022Remark);
this.layoutMx1.Controls.Add(this.txt_daa010);
- this.layoutMx1.Controls.Add(this.txt_mesEndProd);
this.layoutMx1.Controls.Add(this.txt_daa011);
this.layoutMx1.Controls.Add(this.txt_dptName);
this.layoutMx1.Controls.Add(this.txt_daa016);
@@ -1075,6 +1096,9 @@
this.layoutMx1.Controls.Add(this.txt_isQiTao);
this.layoutMx1.Controls.Add(this.txt_daa018);
this.layoutMx1.Controls.Add(this.txt_daa025);
+ this.layoutMx1.Controls.Add(this.txt_daa021);
+ this.layoutMx1.Controls.Add(this.txt_mesStartProd);
+ this.layoutMx1.Controls.Add(this.txt_mesEndProd);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem29,
@@ -1082,16 +1106,16 @@
this.layoutControlItem41});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1059, 277, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(662, 232, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1650, 192);
+ this.layoutMx1.Size = new System.Drawing.Size(1650, 200);
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.Location = new System.Drawing.Point(928, 162);
this.txt_daa015.Name = "txt_daa015";
this.txt_daa015.Size = new System.Drawing.Size(301, 24);
this.txt_daa015.TabIndex = 478;
@@ -1107,10 +1131,10 @@
//
// txt_daa009
//
- this.txt_daa009.Location = new System.Drawing.Point(114, 155);
+ this.txt_daa009.Location = new System.Drawing.Point(521, 162);
this.txt_daa009.Name = "txt_daa009";
this.txt_daa009.Properties.Appearance.Options.UseFont = true;
- this.txt_daa009.Size = new System.Drawing.Size(708, 24);
+ this.txt_daa009.Size = new System.Drawing.Size(301, 24);
this.txt_daa009.StyleController = this.layoutMx1;
this.txt_daa009.TabIndex = 240;
this.txt_daa009.Tag = "";
@@ -1147,7 +1171,7 @@
//
// txt_saleOrderNo
//
- this.txt_saleOrderNo.Location = new System.Drawing.Point(928, 126);
+ this.txt_saleOrderNo.Location = new System.Drawing.Point(928, 132);
this.txt_saleOrderNo.Name = "txt_saleOrderNo";
this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
this.txt_saleOrderNo.Size = new System.Drawing.Size(301, 24);
@@ -1155,19 +1179,9 @@
this.txt_saleOrderNo.TabIndex = 465;
this.txt_saleOrderNo.Tag = "readonly";
//
- // txt_mesStartProd
- //
- 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(303, 24);
- this.txt_mesStartProd.StyleController = this.layoutMx1;
- this.txt_mesStartProd.TabIndex = 336;
- this.txt_mesStartProd.Tag = "readonly";
- //
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(114, 40);
+ this.txt_daa014.Location = new System.Drawing.Point(114, 42);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Properties.Appearance.Options.UseFont = true;
this.txt_daa014.Size = new System.Drawing.Size(301, 24);
@@ -1187,7 +1201,7 @@
//
// txt_daa010
//
- this.txt_daa010.Location = new System.Drawing.Point(928, 40);
+ this.txt_daa010.Location = new System.Drawing.Point(928, 42);
this.txt_daa010.Name = "txt_daa010";
this.txt_daa010.Properties.Appearance.Options.UseFont = true;
this.txt_daa010.Size = new System.Drawing.Size(301, 24);
@@ -1195,19 +1209,9 @@
this.txt_daa010.TabIndex = 243;
this.txt_daa010.Tag = "readonly";
//
- // txt_mesEndProd
- //
- 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(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(928, 68);
+ this.txt_daa011.Location = new System.Drawing.Point(928, 72);
this.txt_daa011.Name = "txt_daa011";
this.txt_daa011.Properties.Appearance.Options.UseFont = true;
this.txt_daa011.Size = new System.Drawing.Size(301, 24);
@@ -1217,7 +1221,7 @@
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(521, 40);
+ this.txt_dptName.Location = new System.Drawing.Point(521, 42);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
this.txt_dptName.Size = new System.Drawing.Size(301, 24);
@@ -1227,7 +1231,7 @@
//
// txt_daa016
//
- this.txt_daa016.Location = new System.Drawing.Point(1335, 68);
+ this.txt_daa016.Location = new System.Drawing.Point(1335, 72);
this.txt_daa016.Name = "txt_daa016";
this.txt_daa016.Properties.Appearance.Options.UseFont = true;
this.txt_daa016.Size = new System.Drawing.Size(303, 24);
@@ -1237,7 +1241,7 @@
//
// txt_daa029
//
- this.txt_daa029.Location = new System.Drawing.Point(114, 68);
+ this.txt_daa029.Location = new System.Drawing.Point(114, 102);
this.txt_daa029.Name = "txt_daa029";
this.txt_daa029.Properties.Appearance.Options.UseFont = true;
this.txt_daa029.Size = new System.Drawing.Size(301, 24);
@@ -1247,7 +1251,7 @@
//
// txt_lineName
//
- this.txt_lineName.Location = new System.Drawing.Point(521, 68);
+ this.txt_lineName.Location = new System.Drawing.Point(521, 72);
this.txt_lineName.Name = "txt_lineName";
this.txt_lineName.Properties.Appearance.Options.UseFont = true;
this.txt_lineName.Size = new System.Drawing.Size(301, 24);
@@ -1257,7 +1261,7 @@
//
// txt_daa017
//
- this.txt_daa017.Location = new System.Drawing.Point(1335, 97);
+ this.txt_daa017.Location = new System.Drawing.Point(1335, 102);
this.txt_daa017.Name = "txt_daa017";
this.txt_daa017.Properties.Appearance.Options.UseFont = true;
this.txt_daa017.Size = new System.Drawing.Size(303, 24);
@@ -1267,7 +1271,7 @@
//
// txt_daa003
//
- this.txt_daa003.Location = new System.Drawing.Point(114, 97);
+ this.txt_daa003.Location = new System.Drawing.Point(114, 132);
this.txt_daa003.Name = "txt_daa003";
this.txt_daa003.Properties.Appearance.Options.UseFont = true;
this.txt_daa003.Size = new System.Drawing.Size(301, 24);
@@ -1277,7 +1281,7 @@
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(928, 97);
+ this.txt_dwName.Location = new System.Drawing.Point(928, 102);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
this.txt_dwName.Size = new System.Drawing.Size(301, 24);
@@ -1287,7 +1291,7 @@
//
// txt_daa004
//
- this.txt_daa004.Location = new System.Drawing.Point(114, 126);
+ this.txt_daa004.Location = new System.Drawing.Point(114, 162);
this.txt_daa004.Name = "txt_daa004";
this.txt_daa004.Properties.Appearance.Options.UseFont = true;
this.txt_daa004.Size = new System.Drawing.Size(301, 24);
@@ -1297,7 +1301,7 @@
//
// txt_lineNo
//
- this.txt_lineNo.Location = new System.Drawing.Point(521, 97);
+ this.txt_lineNo.Location = new System.Drawing.Point(521, 102);
this.txt_lineNo.Name = "txt_lineNo";
this.txt_lineNo.Size = new System.Drawing.Size(301, 24);
this.txt_lineNo.StyleController = this.layoutMx1;
@@ -1315,7 +1319,7 @@
//
// txt_isQiTao
//
- this.txt_isQiTao.Location = new System.Drawing.Point(1233, 126);
+ this.txt_isQiTao.Location = new System.Drawing.Point(1233, 132);
this.txt_isQiTao.Name = "txt_isQiTao";
this.txt_isQiTao.Properties.Caption = "澶囨枡榻愬";
this.txt_isQiTao.Size = new System.Drawing.Size(405, 24);
@@ -1325,7 +1329,7 @@
//
// txt_daa018
//
- this.txt_daa018.Location = new System.Drawing.Point(521, 126);
+ this.txt_daa018.Location = new System.Drawing.Point(521, 132);
this.txt_daa018.Name = "txt_daa018";
this.txt_daa018.Size = new System.Drawing.Size(301, 24);
this.txt_daa018.StyleController = this.layoutMx1;
@@ -1334,7 +1338,7 @@
//
// txt_daa025
//
- this.txt_daa025.Location = new System.Drawing.Point(1335, 155);
+ this.txt_daa025.Location = new System.Drawing.Point(1335, 162);
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)});
@@ -1349,6 +1353,51 @@
this.txt_daa025.Size = new System.Drawing.Size(303, 24);
this.txt_daa025.StyleController = this.layoutMx1;
this.txt_daa025.TabIndex = 479;
+ //
+ // txt_daa021
+ //
+ this.txt_daa021.Location = new System.Drawing.Point(114, 72);
+ this.txt_daa021.Name = "txt_daa021";
+ this.txt_daa021.Size = new System.Drawing.Size(301, 24);
+ this.txt_daa021.StyleController = this.layoutMx1;
+ this.txt_daa021.TabIndex = 480;
+ this.txt_daa021.Tag = "readonly";
+ //
+ // txt_mesStartProd
+ //
+ this.txt_mesStartProd.EditValue = null;
+ this.txt_mesStartProd.Location = new System.Drawing.Point(1335, 12);
+ this.txt_mesStartProd.Name = "txt_mesStartProd";
+ this.txt_mesStartProd.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_mesStartProd.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_mesStartProd.Properties.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm";
+ this.txt_mesStartProd.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+ this.txt_mesStartProd.Properties.EditFormat.FormatString = "yyyy-MM-dd HH:mm";
+ this.txt_mesStartProd.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+ this.txt_mesStartProd.Properties.MaskSettings.Set("mask", "yyyy-MM-dd HH:mm");
+ this.txt_mesStartProd.Size = new System.Drawing.Size(303, 24);
+ this.txt_mesStartProd.StyleController = this.layoutMx1;
+ this.txt_mesStartProd.TabIndex = 481;
+ //
+ // txt_mesEndProd
+ //
+ this.txt_mesEndProd.EditValue = null;
+ this.txt_mesEndProd.Location = new System.Drawing.Point(1335, 42);
+ this.txt_mesEndProd.Name = "txt_mesEndProd";
+ this.txt_mesEndProd.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_mesEndProd.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_mesEndProd.Properties.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm";
+ this.txt_mesEndProd.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+ this.txt_mesEndProd.Properties.EditFormat.FormatString = "yyyy-MM-dd HH:mm";
+ this.txt_mesEndProd.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+ this.txt_mesEndProd.Properties.MaskSettings.Set("mask", "yyyy-MM-dd HH:mm");
+ this.txt_mesEndProd.Size = new System.Drawing.Size(303, 24);
+ this.txt_mesEndProd.StyleController = this.layoutMx1;
+ this.txt_mesEndProd.TabIndex = 482;
//
// layoutControlItem29
//
@@ -1398,21 +1447,22 @@
this.layoutControlItem6,
this.layoutControlItem20,
this.layoutControlItem15,
- this.layoutControlItem4,
- this.layoutControlItem8,
this.layoutControlItem12,
this.layoutControlItem16,
this.layoutControlItem9,
- this.layoutControlItem13,
- this.layoutControlItem19,
- this.layoutControlItem17,
- this.layoutControlItem28,
this.txt_daa015label,
this.layoutControlItem14,
this.layoutControlItem46,
this.layoutControlItem48,
this.layoutControlItem40,
- this.layoutControlItem27});
+ this.layoutControlItem27,
+ this.layoutControlItem28,
+ this.layoutControlItem17,
+ this.layoutControlItem19,
+ this.layoutControlItem13,
+ this.layoutControlItem49,
+ this.txt_mesStartProd123,
+ this.layoutControlItem8});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1447,7 +1497,7 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1650, 192);
+ this.Root.Size = new System.Drawing.Size(1650, 200);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1455,7 +1505,7 @@
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(407, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(407, 30);
this.layoutControlItem1.Text = "宸ュ崟鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1465,39 +1515,39 @@
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(407, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(407, 30);
this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_daa014;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 30);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(407, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(407, 30);
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(814, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(814, 30);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(407, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(407, 30);
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(814, 56);
+ this.layoutControlItem11.Location = new System.Drawing.Point(814, 60);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem11.Size = new System.Drawing.Size(407, 30);
this.layoutControlItem11.Text = "宸茬敓浜ч噺";
this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1507,158 +1557,95 @@
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(407, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(407, 30);
this.layoutControlItem6.Text = "閫氱煡澶囨枡";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_dptName;
- this.layoutControlItem20.Location = new System.Drawing.Point(407, 28);
+ this.layoutControlItem20.Location = new System.Drawing.Point(407, 30);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem20.Size = new System.Drawing.Size(407, 28);
+ this.layoutControlItem20.Size = new System.Drawing.Size(407, 30);
this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_dwName;
- this.layoutControlItem15.Location = new System.Drawing.Point(814, 85);
+ this.layoutControlItem15.Location = new System.Drawing.Point(814, 90);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem15.Size = new System.Drawing.Size(407, 30);
this.layoutControlItem15.Text = "鍗曚綅";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_mesStartProd;
- this.layoutControlItem4.CustomizationFormText = "Mes棰勮寮�宸�";
- 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(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(1221, 28);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- 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(1221, 56);
+ this.layoutControlItem12.Location = new System.Drawing.Point(1221, 60);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(409, 29);
+ this.layoutControlItem12.Size = new System.Drawing.Size(409, 30);
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(1221, 85);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1221, 90);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(409, 29);
+ this.layoutControlItem16.Size = new System.Drawing.Size(409, 30);
this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_saleOrderNo;
- this.layoutControlItem9.Location = new System.Drawing.Point(814, 114);
+ this.layoutControlItem9.Location = new System.Drawing.Point(814, 120);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem9.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem9.Size = new System.Drawing.Size(407, 30);
this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_daa029;
- 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(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, 85);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
- 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, 114);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- 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, 143);
- this.layoutControlItem28.Name = "layoutControlItem28";
- this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
- 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.Location = new System.Drawing.Point(814, 150);
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.Size = new System.Drawing.Size(407, 30);
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.Location = new System.Drawing.Point(407, 60);
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.Size = new System.Drawing.Size(407, 30);
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(1221, 114);
+ this.layoutControlItem46.Location = new System.Drawing.Point(1221, 120);
this.layoutControlItem46.Name = "layoutControlItem46";
this.layoutControlItem46.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem46.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem46.Size = new System.Drawing.Size(409, 29);
+ this.layoutControlItem46.Size = new System.Drawing.Size(409, 30);
this.layoutControlItem46.Text = "澶囨枡榻愭稕";
this.layoutControlItem46.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem46.TextVisible = false;
@@ -1666,35 +1653,107 @@
// layoutControlItem48
//
this.layoutControlItem48.Control = this.txt_daa018;
- this.layoutControlItem48.Location = new System.Drawing.Point(407, 114);
+ this.layoutControlItem48.Location = new System.Drawing.Point(407, 120);
this.layoutControlItem48.Name = "layoutControlItem48";
this.layoutControlItem48.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem48.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem48.Size = new System.Drawing.Size(407, 29);
+ this.layoutControlItem48.Size = new System.Drawing.Size(407, 30);
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.Location = new System.Drawing.Point(407, 90);
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.Size = new System.Drawing.Size(407, 30);
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.Location = new System.Drawing.Point(1221, 150);
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.Size = new System.Drawing.Size(409, 30);
this.layoutControlItem27.Text = "鐢熶骇绫诲瀷";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem28
+ //
+ this.layoutControlItem28.Control = this.txt_daa009;
+ this.layoutControlItem28.Location = new System.Drawing.Point(407, 150);
+ this.layoutControlItem28.Name = "layoutControlItem28";
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem28.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_daa004;
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 150);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem17.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem17.Text = "浜у搧瑙勬牸";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_daa003;
+ this.layoutControlItem19.Location = new System.Drawing.Point(0, 120);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem19.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem19.Text = "浜у搧鍚嶇О";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_daa029;
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 90);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem13.Text = "浜у搧缂栫爜";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem49
+ //
+ this.layoutControlItem49.Control = this.txt_daa021;
+ this.layoutControlItem49.Location = new System.Drawing.Point(0, 60);
+ this.layoutControlItem49.Name = "layoutControlItem49";
+ this.layoutControlItem49.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem49.Size = new System.Drawing.Size(407, 30);
+ this.layoutControlItem49.Text = "浠诲姟鍗曞彿";
+ this.layoutControlItem49.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // txt_mesStartProd123
+ //
+ this.txt_mesStartProd123.Control = this.txt_mesStartProd;
+ this.txt_mesStartProd123.Location = new System.Drawing.Point(1221, 0);
+ this.txt_mesStartProd123.Name = "txt_mesStartProd123";
+ this.txt_mesStartProd123.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.txt_mesStartProd123.Size = new System.Drawing.Size(409, 30);
+ this.txt_mesStartProd123.Text = "Mes棰勮寮�宸�";
+ this.txt_mesStartProd123.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_mesEndProd;
+ this.layoutControlItem8.Location = new System.Drawing.Point(1221, 30);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem8.Size = new System.Drawing.Size(409, 30);
+ this.layoutControlItem8.Text = "Mes棰勮瀹屽伐";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -1702,7 +1761,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(1650, 504);
+ this.tabMx.Size = new System.Drawing.Size(1650, 496);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1719,17 +1778,18 @@
this.tabMxPage1.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
this.tabMxPage1.Appearance.Header.Options.UseForeColor = true;
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Controls.Add(this.panel1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1648, 472);
+ this.tabMxPage1.Size = new System.Drawing.Size(1648, 464);
this.tabMxPage1.Text = "澶囨枡鍗曡韩";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.Location = new System.Drawing.Point(0, 0);
+ this.gcMx1.Location = new System.Drawing.Point(0, 54);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1648, 472);
+ this.gcMx1.Size = new System.Drawing.Size(1648, 410);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1767,7 +1827,8 @@
this.gvMx1dab019,
this.gvMx1dab020,
this.gvMx1dab022,
- this.gvMx1dab023});
+ this.gvMx1dab023,
+ this.gridColumn58});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1790,7 +1851,7 @@
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 89;
//
// gvMx1dab001
//
@@ -1802,7 +1863,7 @@
this.gvMx1dab001.Tag = "query_a.dab001";
this.gvMx1dab001.Visible = true;
this.gvMx1dab001.VisibleIndex = 1;
- this.gvMx1dab001.Width = 94;
+ this.gvMx1dab001.Width = 89;
//
// gvMx1dab003
//
@@ -1814,7 +1875,7 @@
this.gvMx1dab003.Tag = "query_a.dab003";
this.gvMx1dab003.Visible = true;
this.gvMx1dab003.VisibleIndex = 2;
- this.gvMx1dab003.Width = 94;
+ this.gvMx1dab003.Width = 89;
//
// gvMx1dab004
//
@@ -1825,8 +1886,8 @@
this.gvMx1dab004.Name = "gvMx1dab004";
this.gvMx1dab004.Tag = "query_a.dab004";
this.gvMx1dab004.Visible = true;
- this.gvMx1dab004.VisibleIndex = 3;
- this.gvMx1dab004.Width = 94;
+ this.gvMx1dab004.VisibleIndex = 4;
+ this.gvMx1dab004.Width = 89;
//
// gvMx1dab005
//
@@ -1837,8 +1898,8 @@
this.gvMx1dab005.Name = "gvMx1dab005";
this.gvMx1dab005.Tag = "query_a.dab005";
this.gvMx1dab005.Visible = true;
- this.gvMx1dab005.VisibleIndex = 4;
- this.gvMx1dab005.Width = 94;
+ this.gvMx1dab005.VisibleIndex = 5;
+ this.gvMx1dab005.Width = 89;
//
// gvMx1dab006
//
@@ -1849,8 +1910,8 @@
this.gvMx1dab006.Name = "gvMx1dab006";
this.gvMx1dab006.Tag = "query_a.dab006";
this.gvMx1dab006.Visible = true;
- this.gvMx1dab006.VisibleIndex = 5;
- this.gvMx1dab006.Width = 94;
+ this.gvMx1dab006.VisibleIndex = 6;
+ this.gvMx1dab006.Width = 89;
//
// gvMx1dab007
//
@@ -1861,8 +1922,8 @@
this.gvMx1dab007.Name = "gvMx1dab007";
this.gvMx1dab007.Tag = "query_a.dab007";
this.gvMx1dab007.Visible = true;
- this.gvMx1dab007.VisibleIndex = 6;
- this.gvMx1dab007.Width = 94;
+ this.gvMx1dab007.VisibleIndex = 7;
+ this.gvMx1dab007.Width = 89;
//
// gridColumn14
//
@@ -1871,8 +1932,8 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 7;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.VisibleIndex = 8;
+ this.gridColumn14.Width = 89;
//
// gvMx1dab014
//
@@ -1883,8 +1944,8 @@
this.gvMx1dab014.Name = "gvMx1dab014";
this.gvMx1dab014.Tag = "query_a.dab014";
this.gvMx1dab014.Visible = true;
- this.gvMx1dab014.VisibleIndex = 8;
- this.gvMx1dab014.Width = 94;
+ this.gvMx1dab014.VisibleIndex = 9;
+ this.gvMx1dab014.Width = 89;
//
// gridColumn15
//
@@ -1893,8 +1954,8 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 9;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.VisibleIndex = 10;
+ this.gridColumn15.Width = 89;
//
// gridColumn16
//
@@ -1903,8 +1964,8 @@
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 10;
- this.gridColumn16.Width = 94;
+ this.gridColumn16.VisibleIndex = 11;
+ this.gridColumn16.Width = 89;
//
// gvMx1dab012
//
@@ -1915,8 +1976,8 @@
this.gvMx1dab012.Name = "gvMx1dab012";
this.gvMx1dab012.Tag = "query_a.dab012";
this.gvMx1dab012.Visible = true;
- this.gvMx1dab012.VisibleIndex = 11;
- this.gvMx1dab012.Width = 94;
+ this.gvMx1dab012.VisibleIndex = 12;
+ this.gvMx1dab012.Width = 89;
//
// gvMx1dab009
//
@@ -1927,8 +1988,8 @@
this.gvMx1dab009.Name = "gvMx1dab009";
this.gvMx1dab009.Tag = "query_a.dab009";
this.gvMx1dab009.Visible = true;
- this.gvMx1dab009.VisibleIndex = 12;
- this.gvMx1dab009.Width = 94;
+ this.gvMx1dab009.VisibleIndex = 13;
+ this.gvMx1dab009.Width = 246;
//
// gvMx1scrapqty
//
@@ -1959,8 +2020,8 @@
this.gvMx1zyBl.Name = "gvMx1zyBl";
this.gvMx1zyBl.Tag = "query_a.zy_bl";
this.gvMx1zyBl.Visible = true;
- this.gvMx1zyBl.VisibleIndex = 17;
- this.gvMx1zyBl.Width = 94;
+ this.gvMx1zyBl.VisibleIndex = 18;
+ this.gvMx1zyBl.Width = 72;
//
// gvMx1llBl
//
@@ -1971,8 +2032,8 @@
this.gvMx1llBl.Name = "gvMx1llBl";
this.gvMx1llBl.Tag = "query_a.ll_bl";
this.gvMx1llBl.Visible = true;
- this.gvMx1llBl.VisibleIndex = 15;
- this.gvMx1llBl.Width = 94;
+ this.gvMx1llBl.VisibleIndex = 16;
+ this.gvMx1llBl.Width = 58;
//
// gvMx1lpTl
//
@@ -1983,8 +2044,8 @@
this.gvMx1lpTl.Name = "gvMx1lpTl";
this.gvMx1lpTl.Tag = "query_a.lp_tl";
this.gvMx1lpTl.Visible = true;
- this.gvMx1lpTl.VisibleIndex = 16;
- this.gvMx1lpTl.Width = 94;
+ this.gvMx1lpTl.VisibleIndex = 17;
+ this.gvMx1lpTl.Width = 58;
//
// gvMx1dab021
//
@@ -1995,8 +2056,8 @@
this.gvMx1dab021.Name = "gvMx1dab021";
this.gvMx1dab021.Tag = "query_a.dab021";
this.gvMx1dab021.Visible = true;
- this.gvMx1dab021.VisibleIndex = 13;
- this.gvMx1dab021.Width = 94;
+ this.gvMx1dab021.VisibleIndex = 14;
+ this.gvMx1dab021.Width = 58;
//
// gvMx1dab010
//
@@ -2077,8 +2138,36 @@
this.gvMx1dab023.Name = "gvMx1dab023";
this.gvMx1dab023.Tag = "query_a.dab023";
this.gvMx1dab023.Visible = true;
- this.gvMx1dab023.VisibleIndex = 14;
- this.gvMx1dab023.Width = 94;
+ this.gvMx1dab023.VisibleIndex = 15;
+ this.gvMx1dab023.Width = 58;
+ //
+ // gridColumn58
+ //
+ this.gridColumn58.Caption = "棰嗘枡杩涘害";
+ this.gridColumn58.FieldName = "barbl";
+ this.gridColumn58.MinWidth = 25;
+ this.gridColumn58.Name = "gridColumn58";
+ this.gridColumn58.Visible = true;
+ this.gridColumn58.VisibleIndex = 3;
+ this.gridColumn58.Width = 94;
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.btnXls);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(1648, 54);
+ this.panel1.TabIndex = 1;
+ //
+ // btnXls
+ //
+ this.btnXls.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16;
+ this.btnXls.Location = new System.Drawing.Point(10, 11);
+ this.btnXls.Name = "btnXls";
+ this.btnXls.Size = new System.Drawing.Size(130, 29);
+ this.btnXls.TabIndex = 0;
+ this.btnXls.Text = "瀵煎嚭澶囨枡鍗曡韩";
//
// xtraTabPage6
//
@@ -2086,7 +2175,7 @@
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.Size = new System.Drawing.Size(1648, 464);
this.xtraTabPage6.Text = "澶囨枡鏄庣粏";
//
// gcMx6
@@ -2095,7 +2184,7 @@
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.Size = new System.Drawing.Size(1648, 464);
this.gcMx6.TabIndex = 1;
this.gcMx6.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx6});
@@ -2245,7 +2334,7 @@
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.Size = new System.Drawing.Size(1648, 464);
this.xtraTabPage7.Text = "宸ュ簭鏄庣粏";
//
// gcMx7
@@ -2257,7 +2346,7 @@
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.Size = new System.Drawing.Size(1648, 464);
this.gcMx7.TabIndex = 1;
this.gcMx7.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx7});
@@ -2270,7 +2359,10 @@
this.gvMx7.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1daa002,
this.gvMx1daa010,
- this.gvMx1daa004});
+ this.gvMx1daa004,
+ this.gridColumn63,
+ this.gridColumn64,
+ this.gridColumn65});
this.gvMx7.GridControl = this.gcMx7;
this.gvMx7.Name = "gvMx7";
this.gvMx7.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -2285,7 +2377,7 @@
this.gvMx1daa002.MinWidth = 50;
this.gvMx1daa002.Name = "gvMx1daa002";
this.gvMx1daa002.OptionsColumn.ReadOnly = true;
- this.gvMx1daa002.Tag = "edit";
+ this.gvMx1daa002.Tag = "query_a.daa010";
this.gvMx1daa002.Visible = true;
this.gvMx1daa002.VisibleIndex = 0;
this.gvMx1daa002.Width = 54;
@@ -2311,10 +2403,46 @@
this.gvMx1daa004.MinWidth = 150;
this.gvMx1daa004.Name = "gvMx1daa004";
this.gvMx1daa004.OptionsColumn.ReadOnly = true;
- this.gvMx1daa004.Tag = "edit";
+ this.gvMx1daa004.Tag = "query_a.daa010";
this.gvMx1daa004.Visible = true;
this.gvMx1daa004.VisibleIndex = 2;
this.gvMx1daa004.Width = 150;
+ //
+ // gridColumn63
+ //
+ this.gridColumn63.Caption = "鏄惁鍙繑宸�";
+ this.gridColumn63.FieldName = "isBack";
+ this.gridColumn63.MinWidth = 25;
+ this.gridColumn63.Name = "gridColumn63";
+ this.gridColumn63.OptionsColumn.ReadOnly = true;
+ this.gridColumn63.Tag = "query_a.daa010";
+ this.gridColumn63.Visible = true;
+ this.gridColumn63.VisibleIndex = 3;
+ this.gridColumn63.Width = 94;
+ //
+ // gridColumn64
+ //
+ this.gridColumn64.Caption = "鏄惁杩旇拷婧爜";
+ this.gridColumn64.FieldName = "isZsm";
+ this.gridColumn64.MinWidth = 25;
+ this.gridColumn64.Name = "gridColumn64";
+ this.gridColumn64.OptionsColumn.ReadOnly = true;
+ this.gridColumn64.Tag = "query_a.daa010";
+ this.gridColumn64.Visible = true;
+ this.gridColumn64.VisibleIndex = 4;
+ this.gridColumn64.Width = 94;
+ //
+ // gridColumn65
+ //
+ this.gridColumn65.Caption = "鏄惁杩旀墭鏉跨爜";
+ this.gridColumn65.FieldName = "isTbm";
+ this.gridColumn65.MinWidth = 25;
+ this.gridColumn65.Name = "gridColumn65";
+ this.gridColumn65.OptionsColumn.ReadOnly = true;
+ this.gridColumn65.Tag = "query_a.daa010";
+ this.gridColumn65.Visible = true;
+ this.gridColumn65.VisibleIndex = 5;
+ this.gridColumn65.Width = 94;
//
// xtraTabPage8
//
@@ -2322,7 +2450,7 @@
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.Size = new System.Drawing.Size(1648, 464);
this.xtraTabPage8.Text = "鏁版嵁閲囬泦鏄庣粏";
//
// gcMx8
@@ -2331,7 +2459,7 @@
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.Size = new System.Drawing.Size(1648, 464);
this.gcMx8.TabIndex = 1;
this.gcMx8.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx8});
@@ -2343,13 +2471,8 @@
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,
@@ -2394,38 +2517,6 @@
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 = "鏁伴噺";
@@ -2434,20 +2525,8 @@
this.gridColumn56.Name = "gridColumn56";
this.gridColumn56.OptionsColumn.ReadOnly = true;
this.gridColumn56.Visible = true;
- this.gridColumn56.VisibleIndex = 6;
+ this.gridColumn56.VisibleIndex = 2;
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
//
@@ -2457,17 +2536,8 @@
this.gridColumn57.Name = "gridColumn57";
this.gridColumn57.OptionsColumn.ReadOnly = true;
this.gridColumn57.Visible = true;
- this.gridColumn57.VisibleIndex = 7;
+ this.gridColumn57.VisibleIndex = 3;
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
//
@@ -2477,7 +2547,7 @@
this.gridColumn59.Name = "gridColumn59";
this.gridColumn59.OptionsColumn.ReadOnly = true;
this.gridColumn59.Visible = true;
- this.gridColumn59.VisibleIndex = 8;
+ this.gridColumn59.VisibleIndex = 4;
this.gridColumn59.Width = 94;
//
// gridColumn60
@@ -2488,7 +2558,7 @@
this.gridColumn60.Name = "gridColumn60";
this.gridColumn60.OptionsColumn.ReadOnly = true;
this.gridColumn60.Visible = true;
- this.gridColumn60.VisibleIndex = 9;
+ this.gridColumn60.VisibleIndex = 5;
this.gridColumn60.Width = 94;
//
// gridColumn61
@@ -2499,25 +2569,25 @@
this.gridColumn61.Name = "gridColumn61";
this.gridColumn61.OptionsColumn.ReadOnly = true;
this.gridColumn61.Visible = true;
- this.gridColumn61.VisibleIndex = 10;
+ this.gridColumn61.VisibleIndex = 6;
this.gridColumn61.Width = 94;
//
// gridColumn62
//
this.gridColumn62.Caption = "鏁版嵁鐘舵��";
- this.gridColumn62.FieldName = "barCodeStatusTxt";
+ this.gridColumn62.FieldName = "bRemark";
this.gridColumn62.MinWidth = 25;
this.gridColumn62.Name = "gridColumn62";
this.gridColumn62.OptionsColumn.ReadOnly = true;
this.gridColumn62.Visible = true;
- this.gridColumn62.VisibleIndex = 11;
+ this.gridColumn62.VisibleIndex = 7;
this.gridColumn62.Width = 94;
//
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.splitMx99);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1648, 472);
+ this.tabMxPage2.Size = new System.Drawing.Size(1648, 464);
this.tabMxPage2.Text = "鎵樻澘鐮佹槑缁�";
//
// splitMx99
@@ -2537,7 +2607,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, 472);
+ this.splitMx99.Size = new System.Drawing.Size(1648, 464);
this.splitMx99.SplitterPosition = 83;
this.splitMx99.TabIndex = 2;
//
@@ -2564,11 +2634,11 @@
//
this.layShuLiang.Controls.Add(this.txt_iCount_1);
this.layShuLiang.Controls.Add(this.txt_yuliang_1);
- this.layShuLiang.Location = new System.Drawing.Point(662, 44);
+ this.layShuLiang.Location = new System.Drawing.Point(654, 44);
this.layShuLiang.Name = "layShuLiang";
this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500);
this.layShuLiang.Root = this.layoutControlGroup3;
- this.layShuLiang.Size = new System.Drawing.Size(321, 28);
+ this.layShuLiang.Size = new System.Drawing.Size(317, 28);
this.layShuLiang.TabIndex = 475;
this.layShuLiang.Text = "dataLayoutControl1";
//
@@ -2577,16 +2647,16 @@
this.txt_iCount_1.Location = new System.Drawing.Point(89, 2);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(69, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(67, 24);
this.txt_iCount_1.StyleController = this.layShuLiang;
this.txt_iCount_1.TabIndex = 5;
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(249, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(247, 2);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(70, 24);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(68, 24);
this.txt_yuliang_1.StyleController = this.layShuLiang;
this.txt_yuliang_1.TabIndex = 6;
//
@@ -2611,7 +2681,7 @@
this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28);
+ this.layoutControlGroup3.Size = new System.Drawing.Size(317, 28);
this.layoutControlGroup3.TextVisible = false;
//
// layoutControlItem25
@@ -2619,7 +2689,7 @@
this.layoutControlItem25.Control = this.txt_iCount_1;
this.layoutControlItem25.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.Size = new System.Drawing.Size(160, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(158, 28);
this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�";
this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2627,16 +2697,16 @@
//
this.layoutControlItem39.Control = this.txt_yuliang_1;
this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟";
- this.layoutControlItem39.Location = new System.Drawing.Point(160, 0);
+ this.layoutControlItem39.Location = new System.Drawing.Point(158, 0);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem39.Size = new System.Drawing.Size(161, 28);
+ this.layoutControlItem39.Size = new System.Drawing.Size(159, 28);
this.layoutControlItem39.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(985, 10);
+ this.radOut.Location = new System.Drawing.Point(973, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2645,7 +2715,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(325, 32);
+ this.radOut.Size = new System.Drawing.Size(321, 32);
this.radOut.StyleController = this.layoutMx99;
this.radOut.TabIndex = 473;
//
@@ -2653,29 +2723,29 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(985, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(973, 42);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(325, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(321, 32);
this.ucBtnPrint1.TabIndex = 464;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(749, 12);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(741, 12);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(230, 24);
this.txt_psnQty_1.StyleController = this.layoutMx99;
this.txt_psnQty_1.TabIndex = 330;
this.txt_psnQty_1.Tag = "readOnly-1";
//
// txt_printRemark
//
- this.txt_printRemark.Location = new System.Drawing.Point(424, 44);
+ this.txt_printRemark.Location = new System.Drawing.Point(420, 44);
this.txt_printRemark.Name = "txt_printRemark";
this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_printRemark.Size = new System.Drawing.Size(234, 24);
+ this.txt_printRemark.Size = new System.Drawing.Size(230, 24);
this.txt_printRemark.StyleController = this.layoutMx99;
this.txt_printRemark.TabIndex = 334;
this.txt_printRemark.Tag = "readOnly-1";
@@ -2683,11 +2753,11 @@
// txt_kQty
//
this.txt_kQty.EditValue = "";
- this.txt_kQty.Location = new System.Drawing.Point(424, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(420, 12);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(230, 24);
this.txt_kQty.StyleController = this.layoutMx99;
this.txt_kQty.TabIndex = 472;
this.txt_kQty.Tag = "readonly";
@@ -2698,7 +2768,7 @@
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(230, 24);
this.txt_yQty.StyleController = this.layoutMx99;
this.txt_yQty.TabIndex = 470;
this.txt_yQty.Tag = "readonly";
@@ -2708,7 +2778,7 @@
this.txt_zQty.Location = new System.Drawing.Point(99, 12);
this.txt_zQty.Name = "txt_zQty";
this.txt_zQty.Properties.ReadOnly = true;
- this.txt_zQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_zQty.Size = new System.Drawing.Size(230, 24);
this.txt_zQty.StyleController = this.layoutMx99;
this.txt_zQty.TabIndex = 474;
//
@@ -2736,7 +2806,7 @@
columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition10.Width = 100D;
columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition11.Width = 328D;
+ columnDefinition11.Width = 323D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition7,
columnDefinition8,
@@ -2750,7 +2820,7 @@
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition8,
rowDefinition9});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -2758,21 +2828,21 @@
this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem23.Control = this.txt_kQty;
- this.layoutControlItem23.Location = new System.Drawing.Point(325, 0);
+ this.layoutControlItem23.Location = new System.Drawing.Point(321, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem23.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.radOut;
- this.layoutControlItem35.Location = new System.Drawing.Point(975, 0);
+ this.layoutControlItem35.Location = new System.Drawing.Point(963, 0);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem35.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem35.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem35.Text = "鑷姩璁＄畻";
this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem35.TextVisible = false;
@@ -2782,12 +2852,12 @@
this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem26.Control = this.ucBtnPrint1;
- this.layoutControlItem26.Location = new System.Drawing.Point(975, 32);
+ this.layoutControlItem26.Location = new System.Drawing.Point(963, 32);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem26.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem26.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem26.Text = "鎵樻澘鎵撳嵃";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem26.TextVisible = false;
@@ -2800,18 +2870,18 @@
this.layoutControlItem22.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem22.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_printRemark;
- this.layoutControlItem21.Location = new System.Drawing.Point(325, 32);
+ this.layoutControlItem21.Location = new System.Drawing.Point(321, 32);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2821,21 +2891,21 @@
this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem24.Control = this.txt_psnQty_1;
this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
- this.layoutControlItem24.Location = new System.Drawing.Point(650, 0);
+ this.layoutControlItem24.Location = new System.Drawing.Point(642, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem24.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem24.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.layShuLiang;
- this.layoutControlItem38.Location = new System.Drawing.Point(650, 32);
+ this.layoutControlItem38.Location = new System.Drawing.Point(642, 32);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem38.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem38.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem38.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem38.TextVisible = false;
@@ -2845,7 +2915,7 @@
this.layoutControlItem36.Control = this.txt_zQty;
this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
- this.layoutControlItem36.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem36.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2855,7 +2925,9 @@
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, 377);
+ this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.rptTuoBanNbz});
+ this.gcMx2.Size = new System.Drawing.Size(1648, 369);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2879,7 +2951,8 @@
this.gvMx2createDate,
this.gridColumn30,
this.gridColumn31,
- this.gridColumn32});
+ this.gridColumn32,
+ this.gridColumn54});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -3032,11 +3105,32 @@
this.gridColumn32.VisibleIndex = 11;
this.gridColumn32.Width = 94;
//
+ // gridColumn54
+ //
+ this.gridColumn54.Caption = "鍙樻洿鍐呭寘瑁呮暟閲�";
+ this.gridColumn54.ColumnEdit = this.rptTuoBanNbz;
+ this.gridColumn54.MinWidth = 25;
+ this.gridColumn54.Name = "gridColumn54";
+ this.gridColumn54.Visible = true;
+ this.gridColumn54.VisibleIndex = 12;
+ this.gridColumn54.Width = 94;
+ //
+ // rptTuoBanNbz
+ //
+ this.rptTuoBanNbz.AutoHeight = false;
+ editorButtonImageOptions2.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions2.Image")));
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.rptTuoBanNbz.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)});
+ this.rptTuoBanNbz.Name = "rptTuoBanNbz";
+ this.rptTuoBanNbz.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.rptTuoBanNbz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptTuoBanNbz_ButtonClick);
+ //
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.splitMx98);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1648, 472);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1648, 464);
this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�";
//
// splitMx98
@@ -3056,8 +3150,8 @@
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, 472);
- this.splitMx98.SplitterPosition = 52;
+ this.splitMx98.Size = new System.Drawing.Size(1648, 464);
+ this.splitMx98.SplitterPosition = 60;
this.splitMx98.TabIndex = 2;
//
// layoutMx98
@@ -3073,7 +3167,7 @@
this.layoutMx98.Name = "layoutMx98";
this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(96, 530, 812, 500);
this.layoutMx98.Root = this.layoutControlGroup2;
- this.layoutMx98.Size = new System.Drawing.Size(1648, 52);
+ this.layoutMx98.Size = new System.Drawing.Size(1648, 60);
this.layoutMx98.TabIndex = 0;
this.layoutMx98.Text = "layoutControl1";
//
@@ -3081,44 +3175,44 @@
//
this.ucBtnPrint98.allClickKey = null;
this.ucBtnPrint98.guidKey = null;
- this.ucBtnPrint98.Location = new System.Drawing.Point(1365, 10);
+ this.ucBtnPrint98.Location = new System.Drawing.Point(1025, 10);
this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint98.Name = "ucBtnPrint98";
this.ucBtnPrint98.rptParameter = null;
- this.ucBtnPrint98.Size = new System.Drawing.Size(273, 32);
+ this.ucBtnPrint98.Size = new System.Drawing.Size(613, 40);
this.ucBtnPrint98.TabIndex = 8;
//
// txt_yQty98
//
- this.txt_yQty98.Location = new System.Drawing.Point(385, 12);
+ this.txt_yQty98.Location = new System.Drawing.Point(317, 12);
this.txt_yQty98.Name = "txt_yQty98";
this.txt_yQty98.Properties.ReadOnly = true;
- this.txt_yQty98.Size = new System.Drawing.Size(165, 24);
+ this.txt_yQty98.Size = new System.Drawing.Size(97, 24);
this.txt_yQty98.StyleController = this.layoutMx98;
this.txt_yQty98.TabIndex = 4;
//
// txt_kQty98
//
- this.txt_kQty98.Location = new System.Drawing.Point(656, 12);
+ this.txt_kQty98.Location = new System.Drawing.Point(520, 12);
this.txt_kQty98.Name = "txt_kQty98";
this.txt_kQty98.Properties.ReadOnly = true;
- this.txt_kQty98.Size = new System.Drawing.Size(165, 24);
+ this.txt_kQty98.Size = new System.Drawing.Size(97, 24);
this.txt_kQty98.StyleController = this.layoutMx98;
this.txt_kQty98.TabIndex = 5;
//
// txt_printRemark98
//
- this.txt_printRemark98.Location = new System.Drawing.Point(927, 12);
+ this.txt_printRemark98.Location = new System.Drawing.Point(723, 12);
this.txt_printRemark98.Name = "txt_printRemark98";
- this.txt_printRemark98.Size = new System.Drawing.Size(165, 24);
+ this.txt_printRemark98.Size = new System.Drawing.Size(97, 24);
this.txt_printRemark98.StyleController = this.layoutMx98;
this.txt_printRemark98.TabIndex = 6;
//
// txt_iCount_98
//
- this.txt_iCount_98.Location = new System.Drawing.Point(1198, 12);
+ this.txt_iCount_98.Location = new System.Drawing.Point(926, 12);
this.txt_iCount_98.Name = "txt_iCount_98";
- this.txt_iCount_98.Size = new System.Drawing.Size(165, 24);
+ this.txt_iCount_98.Size = new System.Drawing.Size(97, 24);
this.txt_iCount_98.StyleController = this.layoutMx98;
this.txt_iCount_98.TabIndex = 7;
//
@@ -3127,7 +3221,7 @@
this.txt_zQty98.Location = new System.Drawing.Point(114, 12);
this.txt_zQty98.Name = "txt_zQty98";
this.txt_zQty98.Properties.ReadOnly = true;
- this.txt_zQty98.Size = new System.Drawing.Size(165, 24);
+ this.txt_zQty98.Size = new System.Drawing.Size(97, 24);
this.txt_zQty98.StyleController = this.layoutMx98;
this.txt_zQty98.TabIndex = 9;
//
@@ -3156,28 +3250,35 @@
columnDefinition16.Width = 100D;
columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition17.Width = 100D;
+ columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition18.Width = 100D;
+ columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition19.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition12,
columnDefinition13,
columnDefinition14,
columnDefinition15,
columnDefinition16,
- columnDefinition17});
+ columnDefinition17,
+ columnDefinition18,
+ columnDefinition19});
rowDefinition10.Height = 100D;
rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition10});
- this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 52);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 60);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.ucBtnPrint98;
- this.layoutControlItem34.Location = new System.Drawing.Point(1355, 0);
+ this.layoutControlItem34.Location = new System.Drawing.Point(1015, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 5;
+ this.layoutControlItem34.OptionsTableLayoutItem.ColumnSpan = 3;
this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem34.Size = new System.Drawing.Size(273, 32);
+ this.layoutControlItem34.Size = new System.Drawing.Size(613, 40);
this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem34.TextVisible = false;
@@ -3185,40 +3286,40 @@
// layoutControlItem33
//
this.layoutControlItem33.Control = this.txt_iCount_98;
- this.layoutControlItem33.Location = new System.Drawing.Point(1084, 0);
+ this.layoutControlItem33.Location = new System.Drawing.Point(812, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem33.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem33.Size = new System.Drawing.Size(203, 40);
this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_printRemark98;
- this.layoutControlItem32.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem32.Location = new System.Drawing.Point(609, 0);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem32.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem32.Size = new System.Drawing.Size(203, 40);
this.layoutControlItem32.Text = "鎵撳嵃澶囨敞";
this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem31
//
this.layoutControlItem31.Control = this.txt_kQty98;
- this.layoutControlItem31.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem31.Location = new System.Drawing.Point(406, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem31.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem31.Size = new System.Drawing.Size(203, 40);
this.layoutControlItem31.Text = "鍙墦鍗版暟閲�";
this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem30
//
this.layoutControlItem30.Control = this.txt_yQty98;
- this.layoutControlItem30.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem30.Location = new System.Drawing.Point(203, 0);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem30.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem30.Size = new System.Drawing.Size(203, 40);
this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
@@ -3227,7 +3328,7 @@
this.layoutControlItem37.Control = this.txt_zQty98;
this.layoutControlItem37.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem37.Name = "layoutControlItem37";
- this.layoutControlItem37.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem37.Size = new System.Drawing.Size(203, 40);
this.layoutControlItem37.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
//
@@ -3237,7 +3338,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, 408);
+ this.gcMx3.Size = new System.Drawing.Size(1648, 392);
this.gcMx3.TabIndex = 1;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -3256,7 +3357,8 @@
this.gridColumn42,
this.gridColumn43,
this.gridColumn34,
- this.gridColumn35});
+ this.gridColumn35,
+ this.gridColumn55});
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -3349,8 +3451,6 @@
this.gridColumn34.MinWidth = 25;
this.gridColumn34.Name = "gridColumn34";
this.gridColumn34.OptionsColumn.ReadOnly = true;
- this.gridColumn34.Visible = true;
- this.gridColumn34.VisibleIndex = 5;
this.gridColumn34.Width = 94;
//
// gridColumn35
@@ -3361,14 +3461,24 @@
this.gridColumn35.Name = "gridColumn35";
this.gridColumn35.OptionsColumn.ReadOnly = true;
this.gridColumn35.Visible = true;
- this.gridColumn35.VisibleIndex = 6;
+ this.gridColumn35.VisibleIndex = 5;
this.gridColumn35.Width = 94;
+ //
+ // gridColumn55
+ //
+ this.gridColumn55.Caption = "鏁版嵁鐘舵��";
+ this.gridColumn55.FieldName = "bRemark";
+ this.gridColumn55.MinWidth = 25;
+ this.gridColumn55.Name = "gridColumn55";
+ this.gridColumn55.Visible = true;
+ this.gridColumn55.VisibleIndex = 6;
+ this.gridColumn55.Width = 94;
//
// xtraTabPage4
//
this.xtraTabPage4.Controls.Add(this.splitMx100);
this.xtraTabPage4.Name = "xtraTabPage4";
- this.xtraTabPage4.Size = new System.Drawing.Size(1648, 472);
+ this.xtraTabPage4.Size = new System.Drawing.Size(1648, 464);
this.xtraTabPage4.Text = "鍚庣洊鐮佹槑缁�";
//
// splitMx100
@@ -3388,8 +3498,8 @@
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, 472);
- this.splitMx100.SplitterPosition = 52;
+ this.splitMx100.Size = new System.Drawing.Size(1648, 464);
+ this.splitMx100.SplitterPosition = 60;
this.splitMx100.TabIndex = 3;
//
// layMx100
@@ -3404,9 +3514,9 @@
this.layMx100.Dock = System.Windows.Forms.DockStyle.Fill;
this.layMx100.Location = new System.Drawing.Point(0, 0);
this.layMx100.Name = "layMx100";
- this.layMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(274, 530, 812, 500);
+ this.layMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(476, 530, 812, 500);
this.layMx100.Root = this.layoutControlGroup4;
- this.layMx100.Size = new System.Drawing.Size(1648, 52);
+ this.layMx100.Size = new System.Drawing.Size(1648, 60);
this.layMx100.TabIndex = 2;
this.layMx100.Text = "dataLayoutControl1";
//
@@ -3414,11 +3524,11 @@
//
this.ucBtnPrint100.allClickKey = null;
this.ucBtnPrint100.guidKey = null;
- this.ucBtnPrint100.Location = new System.Drawing.Point(1096, 10);
+ this.ucBtnPrint100.Location = new System.Drawing.Point(914, 10);
this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint100.Name = "ucBtnPrint100";
this.ucBtnPrint100.rptParameter = null;
- this.ucBtnPrint100.Size = new System.Drawing.Size(272, 32);
+ this.ucBtnPrint100.Size = new System.Drawing.Size(454, 40);
this.ucBtnPrint100.TabIndex = 0;
//
// btnIn
@@ -3436,33 +3546,33 @@
this.txt_zQty100.Location = new System.Drawing.Point(114, 12);
this.txt_zQty100.Name = "txt_zQty100";
this.txt_zQty100.Properties.ReadOnly = true;
- this.txt_zQty100.Size = new System.Drawing.Size(164, 24);
+ this.txt_zQty100.Size = new System.Drawing.Size(120, 24);
this.txt_zQty100.StyleController = this.layMx100;
this.txt_zQty100.TabIndex = 4;
//
// txt_yQty100
//
- this.txt_yQty100.Location = new System.Drawing.Point(384, 12);
+ this.txt_yQty100.Location = new System.Drawing.Point(340, 12);
this.txt_yQty100.Name = "txt_yQty100";
this.txt_yQty100.Properties.ReadOnly = true;
- this.txt_yQty100.Size = new System.Drawing.Size(166, 24);
+ this.txt_yQty100.Size = new System.Drawing.Size(120, 24);
this.txt_yQty100.StyleController = this.layMx100;
this.txt_yQty100.TabIndex = 5;
//
// txt_kQty100
//
- this.txt_kQty100.Location = new System.Drawing.Point(656, 12);
+ this.txt_kQty100.Location = new System.Drawing.Point(566, 12);
this.txt_kQty100.Name = "txt_kQty100";
this.txt_kQty100.Properties.ReadOnly = true;
- this.txt_kQty100.Size = new System.Drawing.Size(166, 24);
+ this.txt_kQty100.Size = new System.Drawing.Size(120, 24);
this.txt_kQty100.StyleController = this.layMx100;
this.txt_kQty100.TabIndex = 6;
//
// txt_iCount_100
//
- this.txt_iCount_100.Location = new System.Drawing.Point(928, 12);
+ this.txt_iCount_100.Location = new System.Drawing.Point(792, 12);
this.txt_iCount_100.Name = "txt_iCount_100";
- this.txt_iCount_100.Size = new System.Drawing.Size(166, 24);
+ this.txt_iCount_100.Size = new System.Drawing.Size(120, 24);
this.txt_iCount_100.StyleController = this.layMx100;
this.txt_iCount_100.TabIndex = 7;
//
@@ -3490,33 +3600,36 @@
this.layoutControlItem47});
this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup4.Name = "Root";
- 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;
+ columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition23.Width = 100D;
+ columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition24.Width = 100D;
+ columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition25.Width = 100D;
+ columnDefinition26.SizeType = System.Windows.Forms.SizeType.Absolute;
+ columnDefinition26.Width = 120D;
+ columnDefinition27.SizeType = System.Windows.Forms.SizeType.Absolute;
+ columnDefinition27.Width = 150D;
this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition18,
- columnDefinition19,
columnDefinition20,
columnDefinition21,
columnDefinition22,
columnDefinition23,
- columnDefinition24});
+ columnDefinition24,
+ columnDefinition25,
+ columnDefinition26,
+ columnDefinition27});
rowDefinition11.Height = 100D;
rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition11});
- this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 52);
+ this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 60);
this.layoutControlGroup4.TextVisible = false;
//
// layoutControlItem42
@@ -3524,17 +3637,17 @@
this.layoutControlItem42.Control = this.txt_zQty100;
this.layoutControlItem42.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem42.Name = "layoutControlItem42";
- this.layoutControlItem42.Size = new System.Drawing.Size(270, 32);
+ this.layoutControlItem42.Size = new System.Drawing.Size(226, 40);
this.layoutControlItem42.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem43
//
this.layoutControlItem43.Control = this.txt_yQty100;
- this.layoutControlItem43.Location = new System.Drawing.Point(270, 0);
+ this.layoutControlItem43.Location = new System.Drawing.Point(226, 0);
this.layoutControlItem43.Name = "layoutControlItem43";
this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem43.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem43.Size = new System.Drawing.Size(226, 40);
this.layoutControlItem43.Text = "宸叉墦鍗版暟";
this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
//
@@ -3542,10 +3655,10 @@
//
this.layoutControlItem44.Control = this.txt_kQty100;
this.layoutControlItem44.CustomizationFormText = "鍙墦鍗版暟";
- this.layoutControlItem44.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem44.Location = new System.Drawing.Point(452, 0);
this.layoutControlItem44.Name = "layoutControlItem44";
this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem44.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem44.Size = new System.Drawing.Size(226, 40);
this.layoutControlItem44.Text = "鍙墦鍗版暟瀛�";
this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18);
//
@@ -3554,8 +3667,8 @@
this.layoutControlItem2.Control = this.btnIn;
this.layoutControlItem2.Location = new System.Drawing.Point(1358, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 5;
- this.layoutControlItem2.Size = new System.Drawing.Size(120, 32);
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 6;
+ this.layoutControlItem2.Size = new System.Drawing.Size(120, 40);
this.layoutControlItem2.Text = "瀵煎叆鎸夐挳";
this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem2.TextVisible = false;
@@ -3563,11 +3676,12 @@
// layoutControlItem10
//
this.layoutControlItem10.Control = this.ucBtnPrint100;
- this.layoutControlItem10.Location = new System.Drawing.Point(1086, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(904, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem10.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem10.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(454, 40);
this.layoutControlItem10.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
@@ -3575,10 +3689,10 @@
// layoutControlItem45
//
this.layoutControlItem45.Control = this.txt_iCount_100;
- this.layoutControlItem45.Location = new System.Drawing.Point(814, 0);
+ this.layoutControlItem45.Location = new System.Drawing.Point(678, 0);
this.layoutControlItem45.Name = "layoutControlItem45";
this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem45.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem45.Size = new System.Drawing.Size(226, 40);
this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
//
@@ -3587,8 +3701,9 @@
this.layoutControlItem47.Control = this.btnDesign;
this.layoutControlItem47.Location = new System.Drawing.Point(1478, 0);
this.layoutControlItem47.Name = "layoutControlItem47";
- this.layoutControlItem47.OptionsTableLayoutItem.ColumnIndex = 6;
- this.layoutControlItem47.Size = new System.Drawing.Size(150, 32);
+ this.layoutControlItem47.OptionsTableLayoutItem.ColumnIndex = 7;
+ this.layoutControlItem47.Size = new System.Drawing.Size(150, 40);
+ this.layoutControlItem47.Text = "瀹㈡埛妯℃澘";
this.layoutControlItem47.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem47.TextVisible = false;
//
@@ -3598,7 +3713,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, 408);
+ this.gcMx4.Size = new System.Drawing.Size(1648, 392);
this.gcMx4.TabIndex = 2;
this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx4});
@@ -3730,7 +3845,7 @@
this.xtraTabPage5.Controls.Add(this.ucBtnPrint101);
this.xtraTabPage5.Name = "xtraTabPage5";
this.xtraTabPage5.PageVisible = false;
- this.xtraTabPage5.Size = new System.Drawing.Size(1648, 472);
+ this.xtraTabPage5.Size = new System.Drawing.Size(1648, 464);
this.xtraTabPage5.Text = "鐗╂枡榻愬鏍囪瘑鍗�";
//
// ucBtnPrint101
@@ -3741,18 +3856,8 @@
this.ucBtnPrint101.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint101.Name = "ucBtnPrint101";
this.ucBtnPrint101.rptParameter = null;
- this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32);
+ this.ucBtnPrint101.Size = new System.Drawing.Size(581, 32);
this.ucBtnPrint101.TabIndex = 0;
- //
- // gridColumn52
- //
- this.gridColumn52.Caption = "鐢熶骇绫诲瀷";
- this.gridColumn52.FieldName = "daa025";
- this.gridColumn52.MinWidth = 25;
- this.gridColumn52.Name = "gridColumn52";
- this.gridColumn52.Visible = true;
- this.gridColumn52.VisibleIndex = 9;
- this.gridColumn52.Width = 94;
//
// Frm_Womdaa
//
@@ -3773,6 +3878,7 @@
this.split1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
this.splitMx1.Panel1.ResumeLayout(false);
@@ -3787,11 +3893,9 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa022Remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa010.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa016.Properties)).EndInit();
@@ -3806,6 +3910,11 @@
((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.txt_daa021.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties.CalendarTimeProperties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties.CalendarTimeProperties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
@@ -3818,26 +3927,28 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).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.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.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem49)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd123)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).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.panel1.ResumeLayout(false);
this.xtraTabPage6.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx6)).EndInit();
@@ -3880,6 +3991,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptTuoBanNbz)).EndInit();
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).EndInit();
this.splitMx98.Panel1.ResumeLayout(false);
@@ -3950,7 +4062,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_daa003;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa004;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa008;
- private DevExpress.XtraGrid.Columns.GridColumn gv_daa011;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa010;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa005;
@@ -3958,8 +4069,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa015;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa009;
- private DevExpress.XtraGrid.Columns.GridColumn gv_prepareTime;
- private DevExpress.XtraGrid.Columns.GridColumn gv_daa028;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa016;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa017;
private DevExpress.XtraGrid.Columns.GridColumn gv_mesStartProd;
@@ -3975,8 +4084,6 @@
private DevExpress.XtraEditors.TextEdit txt_daa013;
private DevExpress.XtraEditors.TextEdit txt_saleOrderNo;
private DevExpress.XtraEditors.TextEdit txt_daa022Remark;
- private DevExpress.XtraEditors.TextEdit txt_mesEndProd;
- private DevExpress.XtraEditors.TextEdit txt_mesStartProd;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_daa014;
private DevExpress.XtraEditors.TextEdit txt_daa017;
@@ -4118,15 +4225,9 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
private DevExpress.XtraDataLayout.DataLayoutControl layMx100;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
private DevExpress.XtraEditors.SimpleButton btnIn;
@@ -4146,7 +4247,6 @@
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.XtraTab.XtraTabPage xtraTabPage6;
private DevExpress.XtraGrid.GridControl gcMx6;
@@ -4176,13 +4276,8 @@
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;
@@ -4194,5 +4289,27 @@
private DevExpress.XtraEditors.ComboBoxEdit txt_daa025;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn52;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn63;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn64;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn65;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptTuoBanNbz;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
+ private DevExpress.XtraEditors.TextEdit txt_daa021;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem49;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn58;
+ private DevExpress.XtraEditors.DateEdit txt_mesStartProd;
+ private DevExpress.XtraEditors.DateEdit txt_mesEndProd;
+ private DevExpress.XtraLayout.LayoutControlItem txt_mesStartProd123;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private System.Windows.Forms.Panel panel1;
+ private DevExpress.XtraEditors.SimpleButton btnXls;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem47;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn66;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3