From 11720482d878d36e0651842c76873ca27cfa6615 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 07 五月 2025 15:59:31 +0800
Subject: [PATCH] 工单梳理
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx | 3
DevApp/Gs.DevApp/UserControl/UcLookPrint.Designer.cs | 3
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | 19
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs | 6
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs | 25
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 24
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 1030 ++++++++++++++++++++++++++++----------------------
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 39 +
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 13
9 files changed, 665 insertions(+), 497 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 2d21bad..02dc7c2 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -30,35 +30,38 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.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 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 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.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
- 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.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -184,6 +187,30 @@
this.gvMx1dab022 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab023 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.splitMx99 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx99 = new DevExpress.XtraLayout.LayoutControl();
+ this.layShuLiang = new DevExpress.XtraDataLayout.DataLayoutControl();
+ this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.radOut = new DevExpress.XtraEditors.RadioGroup();
+ this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
+ this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_printRemark = new DevExpress.XtraEditors.TextEdit();
+ this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
+ this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
+ this.txt_zQty = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -204,25 +231,6 @@
this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.panMx99 = new System.Windows.Forms.Panel();
- this.layoutMx99 = new DevExpress.XtraLayout.LayoutControl();
- this.radOut = new DevExpress.XtraEditors.RadioGroup();
- this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
- this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
- this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
- this.txt_printRemark = new DevExpress.XtraEditors.TextEdit();
- this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
- this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
- this.txt_zQty = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx3 = new DevExpress.XtraGrid.GridControl();
this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -334,14 +342,22 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
this.tabMxPage2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- this.panMx99.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx99)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx99.Panel1)).BeginInit();
+ this.splitMx99.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx99.Panel2)).BeginInit();
+ this.splitMx99.Panel2.SuspendLayout();
+ this.splitMx99.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx99)).BeginInit();
this.layoutMx99.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layShuLiang)).BeginInit();
+ this.layShuLiang.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
@@ -349,13 +365,16 @@
((System.ComponentModel.ISupportInitialize)(this.txt_zQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
@@ -1008,20 +1027,20 @@
//
// txt_daa009
//
- this.txt_daa009.Location = new System.Drawing.Point(425, 152);
+ this.txt_daa009.Location = new System.Drawing.Point(420, 152);
this.txt_daa009.Name = "txt_daa009";
this.txt_daa009.Properties.Appearance.Options.UseFont = true;
- this.txt_daa009.Size = new System.Drawing.Size(518, 24);
+ this.txt_daa009.Size = new System.Drawing.Size(506, 24);
this.txt_daa009.StyleController = this.layoutMx1;
this.txt_daa009.TabIndex = 240;
this.txt_daa009.Tag = "";
//
// txt_daa013
//
- this.txt_daa013.Location = new System.Drawing.Point(737, 124);
+ this.txt_daa013.Location = new System.Drawing.Point(726, 124);
this.txt_daa013.Name = "txt_daa013";
this.txt_daa013.Properties.Appearance.Options.UseFont = true;
- this.txt_daa013.Size = new System.Drawing.Size(206, 24);
+ this.txt_daa013.Size = new System.Drawing.Size(200, 24);
this.txt_daa013.StyleController = this.layoutMx1;
this.txt_daa013.TabIndex = 472;
this.txt_daa013.Tag = "readonly";
@@ -1031,27 +1050,27 @@
this.txt_daa001.Location = new System.Drawing.Point(114, 12);
this.txt_daa001.Name = "txt_daa001";
this.txt_daa001.Properties.Appearance.Options.UseFont = true;
- this.txt_daa001.Size = new System.Drawing.Size(205, 24);
+ this.txt_daa001.Size = new System.Drawing.Size(200, 24);
this.txt_daa001.StyleController = this.layoutMx1;
this.txt_daa001.TabIndex = 216;
this.txt_daa001.Tag = "readonly";
//
// textEdit1
//
- this.textEdit1.Location = new System.Drawing.Point(425, 40);
+ this.textEdit1.Location = new System.Drawing.Point(420, 40);
this.textEdit1.Name = "textEdit1";
this.textEdit1.Properties.Appearance.Options.UseFont = true;
- this.textEdit1.Size = new System.Drawing.Size(206, 24);
+ this.textEdit1.Size = new System.Drawing.Size(200, 24);
this.textEdit1.StyleController = this.layoutMx1;
this.textEdit1.TabIndex = 467;
this.textEdit1.Tag = "readonly";
//
// txt_daa008
//
- this.txt_daa008.Location = new System.Drawing.Point(737, 12);
+ this.txt_daa008.Location = new System.Drawing.Point(726, 12);
this.txt_daa008.Name = "txt_daa008";
this.txt_daa008.Properties.Appearance.Options.UseFont = true;
- this.txt_daa008.Size = new System.Drawing.Size(206, 24);
+ this.txt_daa008.Size = new System.Drawing.Size(200, 24);
this.txt_daa008.StyleController = this.layoutMx1;
this.txt_daa008.TabIndex = 235;
this.txt_daa008.Tag = "readonly";
@@ -1061,27 +1080,27 @@
this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 68);
this.txt_saleOrderNo.Name = "txt_saleOrderNo";
this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_saleOrderNo.Size = new System.Drawing.Size(205, 24);
+ this.txt_saleOrderNo.Size = new System.Drawing.Size(200, 24);
this.txt_saleOrderNo.StyleController = this.layoutMx1;
this.txt_saleOrderNo.TabIndex = 465;
this.txt_saleOrderNo.Tag = "readonly";
//
// txt_daa028
//
- this.txt_daa028.Location = new System.Drawing.Point(425, 68);
+ this.txt_daa028.Location = new System.Drawing.Point(420, 68);
this.txt_daa028.Name = "txt_daa028";
this.txt_daa028.Properties.Appearance.Options.UseFont = true;
- this.txt_daa028.Size = new System.Drawing.Size(206, 24);
+ this.txt_daa028.Size = new System.Drawing.Size(200, 24);
this.txt_daa028.StyleController = this.layoutMx1;
this.txt_daa028.TabIndex = 341;
this.txt_daa028.Tag = "readonly";
//
// txt_mesStartProd
//
- this.txt_mesStartProd.Location = new System.Drawing.Point(1049, 40);
+ this.txt_mesStartProd.Location = new System.Drawing.Point(1032, 40);
this.txt_mesStartProd.Name = "txt_mesStartProd";
this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
- this.txt_mesStartProd.Size = new System.Drawing.Size(206, 24);
+ this.txt_mesStartProd.Size = new System.Drawing.Size(202, 24);
this.txt_mesStartProd.StyleController = this.layoutMx1;
this.txt_mesStartProd.TabIndex = 336;
this.txt_mesStartProd.Tag = "readonly";
@@ -1091,67 +1110,67 @@
this.txt_daa014.Location = new System.Drawing.Point(114, 40);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Properties.Appearance.Options.UseFont = true;
- this.txt_daa014.Size = new System.Drawing.Size(205, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(200, 24);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 327;
this.txt_daa014.Tag = "readonly";
//
// txt_daa022Remark
//
- this.txt_daa022Remark.Location = new System.Drawing.Point(425, 12);
+ this.txt_daa022Remark.Location = new System.Drawing.Point(420, 12);
this.txt_daa022Remark.Name = "txt_daa022Remark";
this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
- this.txt_daa022Remark.Size = new System.Drawing.Size(206, 24);
+ this.txt_daa022Remark.Size = new System.Drawing.Size(200, 24);
this.txt_daa022Remark.StyleController = this.layoutMx1;
this.txt_daa022Remark.TabIndex = 462;
this.txt_daa022Remark.Tag = "readonly";
//
// txt_daa010
//
- this.txt_daa010.Location = new System.Drawing.Point(737, 40);
+ this.txt_daa010.Location = new System.Drawing.Point(726, 40);
this.txt_daa010.Name = "txt_daa010";
this.txt_daa010.Properties.Appearance.Options.UseFont = true;
- this.txt_daa010.Size = new System.Drawing.Size(206, 24);
+ this.txt_daa010.Size = new System.Drawing.Size(200, 24);
this.txt_daa010.StyleController = this.layoutMx1;
this.txt_daa010.TabIndex = 243;
this.txt_daa010.Tag = "readonly";
//
// txt_mesEndProd
//
- this.txt_mesEndProd.Location = new System.Drawing.Point(1049, 68);
+ this.txt_mesEndProd.Location = new System.Drawing.Point(1032, 68);
this.txt_mesEndProd.Name = "txt_mesEndProd";
this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
- this.txt_mesEndProd.Size = new System.Drawing.Size(206, 24);
+ this.txt_mesEndProd.Size = new System.Drawing.Size(202, 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(737, 68);
+ this.txt_daa011.Location = new System.Drawing.Point(726, 68);
this.txt_daa011.Name = "txt_daa011";
this.txt_daa011.Properties.Appearance.Options.UseFont = true;
- this.txt_daa011.Size = new System.Drawing.Size(206, 24);
+ this.txt_daa011.Size = new System.Drawing.Size(200, 24);
this.txt_daa011.StyleController = this.layoutMx1;
this.txt_daa011.TabIndex = 247;
this.txt_daa011.Tag = "readonly";
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(737, 96);
+ this.txt_dptName.Location = new System.Drawing.Point(726, 96);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
- this.txt_dptName.Size = new System.Drawing.Size(206, 24);
+ this.txt_dptName.Size = new System.Drawing.Size(200, 24);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 258;
this.txt_dptName.Tag = "readonly";
//
// txt_daa016
//
- this.txt_daa016.Location = new System.Drawing.Point(1049, 96);
+ this.txt_daa016.Location = new System.Drawing.Point(1032, 96);
this.txt_daa016.Name = "txt_daa016";
this.txt_daa016.Properties.Appearance.Options.UseFont = true;
- this.txt_daa016.Size = new System.Drawing.Size(206, 24);
+ this.txt_daa016.Size = new System.Drawing.Size(202, 24);
this.txt_daa016.StyleController = this.layoutMx1;
this.txt_daa016.TabIndex = 273;
this.txt_daa016.Tag = "readonly";
@@ -1161,27 +1180,27 @@
this.txt_daa029.Location = new System.Drawing.Point(114, 96);
this.txt_daa029.Name = "txt_daa029";
this.txt_daa029.Properties.Appearance.Options.UseFont = true;
- this.txt_daa029.Size = new System.Drawing.Size(205, 24);
+ this.txt_daa029.Size = new System.Drawing.Size(200, 24);
this.txt_daa029.StyleController = this.layoutMx1;
this.txt_daa029.TabIndex = 217;
this.txt_daa029.Tag = "readonly";
//
// txt_lineName
//
- this.txt_lineName.Location = new System.Drawing.Point(425, 96);
+ this.txt_lineName.Location = new System.Drawing.Point(420, 96);
this.txt_lineName.Name = "txt_lineName";
this.txt_lineName.Properties.Appearance.Options.UseFont = true;
- this.txt_lineName.Size = new System.Drawing.Size(206, 24);
+ this.txt_lineName.Size = new System.Drawing.Size(200, 24);
this.txt_lineName.StyleController = this.layoutMx1;
this.txt_lineName.TabIndex = 267;
this.txt_lineName.Tag = "readonly";
//
// txt_daa017
//
- this.txt_daa017.Location = new System.Drawing.Point(1049, 124);
+ this.txt_daa017.Location = new System.Drawing.Point(1032, 124);
this.txt_daa017.Name = "txt_daa017";
this.txt_daa017.Properties.Appearance.Options.UseFont = true;
- this.txt_daa017.Size = new System.Drawing.Size(206, 24);
+ this.txt_daa017.Size = new System.Drawing.Size(202, 24);
this.txt_daa017.StyleController = this.layoutMx1;
this.txt_daa017.TabIndex = 280;
this.txt_daa017.Tag = "readonly";
@@ -1191,17 +1210,17 @@
this.txt_daa003.Location = new System.Drawing.Point(114, 152);
this.txt_daa003.Name = "txt_daa003";
this.txt_daa003.Properties.Appearance.Options.UseFont = true;
- this.txt_daa003.Size = new System.Drawing.Size(205, 24);
+ this.txt_daa003.Size = new System.Drawing.Size(200, 24);
this.txt_daa003.StyleController = this.layoutMx1;
this.txt_daa003.TabIndex = 219;
this.txt_daa003.Tag = "readonly";
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(1049, 12);
+ this.txt_dwName.Location = new System.Drawing.Point(1032, 12);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
- this.txt_dwName.Size = new System.Drawing.Size(206, 24);
+ this.txt_dwName.Size = new System.Drawing.Size(202, 24);
this.txt_dwName.StyleController = this.layoutMx1;
this.txt_dwName.TabIndex = 226;
this.txt_dwName.Tag = "readonly";
@@ -1211,16 +1230,16 @@
this.txt_daa004.Location = new System.Drawing.Point(114, 124);
this.txt_daa004.Name = "txt_daa004";
this.txt_daa004.Properties.Appearance.Options.UseFont = true;
- this.txt_daa004.Size = new System.Drawing.Size(205, 24);
+ this.txt_daa004.Size = new System.Drawing.Size(200, 24);
this.txt_daa004.StyleController = this.layoutMx1;
this.txt_daa004.TabIndex = 222;
this.txt_daa004.Tag = "readonly";
//
// txt_daa015
//
- this.txt_daa015.Location = new System.Drawing.Point(425, 124);
+ this.txt_daa015.Location = new System.Drawing.Point(420, 124);
this.txt_daa015.Name = "txt_daa015";
- this.txt_daa015.Size = new System.Drawing.Size(206, 24);
+ this.txt_daa015.Size = new System.Drawing.Size(200, 24);
this.txt_daa015.StyleController = this.layoutMx1;
this.txt_daa015.TabIndex = 473;
//
@@ -1265,39 +1284,39 @@
this.layoutControlItem18});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
- 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;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition16,
- columnDefinition17,
- columnDefinition18,
- columnDefinition19});
- rowDefinition10.Height = 100D;
- rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition11.Height = 100D;
- rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition12.Height = 100D;
- rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition15.Height = 100D;
- rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition10,
- rowDefinition11,
- rowDefinition12,
- rowDefinition13,
- rowDefinition14,
- rowDefinition15});
- this.Root.Size = new System.Drawing.Size(1267, 188);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
+ this.Root.Size = new System.Drawing.Size(1246, 188);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1305,17 +1324,17 @@
this.layoutControlItem1.Control = this.txt_daa001;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(311, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem1.Text = "宸ュ崟鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_daa008;
- this.layoutControlItem3.Location = new System.Drawing.Point(623, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(612, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(312, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1325,18 +1344,18 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(311, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem5.Text = "鎶曟枡鍗曞彿";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_daa010;
- this.layoutControlItem7.Location = new System.Drawing.Point(623, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(612, 28);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(312, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1346,29 +1365,29 @@
this.layoutControlItem9.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(311, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_daa028;
- this.layoutControlItem10.Location = new System.Drawing.Point(311, 56);
+ this.layoutControlItem10.Location = new System.Drawing.Point(306, 56);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(312, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem10.Text = "澶囨枡鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_daa011;
- this.layoutControlItem11.Location = new System.Drawing.Point(623, 56);
+ this.layoutControlItem11.Location = new System.Drawing.Point(612, 56);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(312, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem11.Text = "宸茬敓浜ч噺";
this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1378,18 +1397,18 @@
this.layoutControlItem13.Location = new System.Drawing.Point(0, 84);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(311, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem13.Text = "浜у搧缂栫爜";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_lineName;
- this.layoutControlItem14.Location = new System.Drawing.Point(311, 84);
+ this.layoutControlItem14.Location = new System.Drawing.Point(306, 84);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(312, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem14.Text = "鐢熶骇绾垮埆";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1399,7 +1418,7 @@
this.layoutControlItem17.Location = new System.Drawing.Point(0, 112);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(311, 28);
+ this.layoutControlItem17.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem17.Text = "浜у搧瑙勬牸";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1409,116 +1428,116 @@
this.layoutControlItem19.Location = new System.Drawing.Point(0, 140);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem19.Size = new System.Drawing.Size(311, 28);
+ this.layoutControlItem19.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem19.Text = "浜у搧鍚嶇О";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_daa022Remark;
- this.layoutControlItem6.Location = new System.Drawing.Point(311, 0);
+ this.layoutControlItem6.Location = new System.Drawing.Point(306, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(312, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem6.Text = "閫氱煡澶囨枡";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.textEdit1;
- this.layoutControlItem2.Location = new System.Drawing.Point(311, 28);
+ this.layoutControlItem2.Location = new System.Drawing.Point(306, 28);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(312, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem2.Text = "澶囨枡鐘舵��";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_dwName;
- this.layoutControlItem15.Location = new System.Drawing.Point(935, 0);
+ this.layoutControlItem15.Location = new System.Drawing.Point(918, 0);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(312, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(308, 28);
this.layoutControlItem15.Text = "鍗曚綅";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_mesStartProd;
- this.layoutControlItem4.Location = new System.Drawing.Point(935, 28);
+ this.layoutControlItem4.Location = new System.Drawing.Point(918, 28);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(312, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(308, 28);
this.layoutControlItem4.Text = "棰勮寮�宸ユ椂闂�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_mesEndProd;
- this.layoutControlItem8.Location = new System.Drawing.Point(935, 56);
+ this.layoutControlItem8.Location = new System.Drawing.Point(918, 56);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(312, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(308, 28);
this.layoutControlItem8.Text = "棰勮瀹屽伐鏃堕棿";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_daa016;
- this.layoutControlItem12.Location = new System.Drawing.Point(935, 84);
+ this.layoutControlItem12.Location = new System.Drawing.Point(918, 84);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(312, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(308, 28);
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(935, 112);
+ this.layoutControlItem16.Location = new System.Drawing.Point(918, 112);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem16.Size = new System.Drawing.Size(312, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(308, 28);
this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_daa009;
- this.layoutControlItem28.Location = new System.Drawing.Point(311, 140);
+ this.layoutControlItem28.Location = new System.Drawing.Point(306, 140);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem28.Size = new System.Drawing.Size(624, 28);
+ this.layoutControlItem28.Size = new System.Drawing.Size(612, 28);
this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_daa015;
- this.layoutControlItem27.Location = new System.Drawing.Point(311, 112);
+ this.layoutControlItem27.Location = new System.Drawing.Point(306, 112);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem27.Size = new System.Drawing.Size(312, 28);
+ this.layoutControlItem27.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem27.Text = "鐢熶骇绾垮埆ID";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_dptName;
- this.layoutControlItem20.Location = new System.Drawing.Point(623, 84);
+ this.layoutControlItem20.Location = new System.Drawing.Point(612, 84);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(312, 28);
+ this.layoutControlItem20.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1526,11 +1545,11 @@
//
this.layoutControlItem18.Control = this.txt_daa013;
this.layoutControlItem18.CustomizationFormText = "鐢熶骇杞﹂棿ID";
- this.layoutControlItem18.Location = new System.Drawing.Point(623, 112);
+ this.layoutControlItem18.Location = new System.Drawing.Point(612, 112);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(312, 28);
+ this.layoutControlItem18.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem18.Text = "杞﹂棿ID";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1903,21 +1922,352 @@
//
// tabMxPage2
//
- this.tabMxPage2.Controls.Add(this.gcMx2);
- this.tabMxPage2.Controls.Add(this.panMx99);
+ this.tabMxPage2.Controls.Add(this.splitMx99);
this.tabMxPage2.Name = "tabMxPage2";
this.tabMxPage2.Size = new System.Drawing.Size(1265, 481);
this.tabMxPage2.Text = "鎵樻澘鐮佹槑缁�";
//
+ // splitMx99
+ //
+ this.splitMx99.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitMx99.Horizontal = false;
+ this.splitMx99.Location = new System.Drawing.Point(0, 0);
+ this.splitMx99.Name = "splitMx99";
+ //
+ // splitMx99.Panel1
+ //
+ this.splitMx99.Panel1.Controls.Add(this.layoutMx99);
+ this.splitMx99.Panel1.Text = "Panel1";
+ //
+ // splitMx99.Panel2
+ //
+ 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(1265, 481);
+ this.splitMx99.SplitterPosition = 83;
+ this.splitMx99.TabIndex = 2;
+ //
+ // layoutMx99
+ //
+ this.layoutMx99.Controls.Add(this.layShuLiang);
+ this.layoutMx99.Controls.Add(this.radOut);
+ this.layoutMx99.Controls.Add(this.ucBtnPrint1);
+ this.layoutMx99.Controls.Add(this.txt_psnQty_1);
+ this.layoutMx99.Controls.Add(this.txt_printRemark);
+ this.layoutMx99.Controls.Add(this.txt_kQty);
+ this.layoutMx99.Controls.Add(this.txt_yQty);
+ this.layoutMx99.Controls.Add(this.txt_zQty);
+ this.layoutMx99.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx99.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx99.Name = "layoutMx99";
+ this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(109, 424, 812, 500);
+ this.layoutMx99.Root = this.layoutControlGroup1;
+ this.layoutMx99.Size = new System.Drawing.Size(1265, 83);
+ this.layoutMx99.TabIndex = 0;
+ this.layoutMx99.Text = "layoutControl1";
+ //
+ // layShuLiang
+ //
+ this.layShuLiang.Controls.Add(this.txt_iCount_1);
+ this.layShuLiang.Controls.Add(this.txt_yuliang_1);
+ this.layShuLiang.Location = new System.Drawing.Point(632, 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(306, 28);
+ this.layShuLiang.TabIndex = 475;
+ this.layShuLiang.Text = "dataLayoutControl1";
+ //
+ // txt_iCount_1
+ //
+ 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(62, 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(242, 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(62, 24);
+ this.txt_yuliang_1.StyleController = this.layShuLiang;
+ this.txt_yuliang_1.TabIndex = 6;
+ //
+ // layoutControlGroup3
+ //
+ this.layoutControlGroup3.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup3.GroupBordersVisible = false;
+ this.layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem25,
+ this.layoutControlItem39});
+ this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup3.Name = "Root";
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition5,
+ columnDefinition6});
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ 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(306, 28);
+ this.layoutControlGroup3.TextVisible = false;
+ //
+ // layoutControlItem25
+ //
+ 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(153, 28);
+ this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem39
+ //
+ this.layoutControlItem39.Control = this.txt_yuliang_1;
+ this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟";
+ this.layoutControlItem39.Location = new System.Drawing.Point(153, 0);
+ this.layoutControlItem39.Name = "layoutControlItem39";
+ this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem39.Size = new System.Drawing.Size(153, 28);
+ this.layoutControlItem39.Text = "鎵撳嵃浣欐暟";
+ this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // radOut
+ //
+ this.radOut.Location = new System.Drawing.Point(943, 10);
+ this.radOut.Margin = new System.Windows.Forms.Padding(0);
+ this.radOut.Name = "radOut";
+ this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
+ this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
+ this.radOut.Size = new System.Drawing.Size(237, 28);
+ this.radOut.StyleController = this.layoutMx99;
+ this.radOut.TabIndex = 473;
+ //
+ // ucBtnPrint1
+ //
+ this.ucBtnPrint1.guidKey = null;
+ this.ucBtnPrint1.Location = new System.Drawing.Point(941, 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(308, 32);
+ this.ucBtnPrint1.TabIndex = 464;
+ //
+ // txt_psnQty_1
+ //
+ this.txt_psnQty_1.Location = new System.Drawing.Point(719, 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(219, 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(409, 44);
+ this.txt_printRemark.Name = "txt_printRemark";
+ this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
+ this.txt_printRemark.Size = new System.Drawing.Size(219, 24);
+ this.txt_printRemark.StyleController = this.layoutMx99;
+ this.txt_printRemark.TabIndex = 334;
+ this.txt_printRemark.Tag = "readOnly-1";
+ //
+ // txt_kQty
+ //
+ this.txt_kQty.EditValue = "";
+ this.txt_kQty.Location = new System.Drawing.Point(409, 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(219, 24);
+ this.txt_kQty.StyleController = this.layoutMx99;
+ this.txt_kQty.TabIndex = 472;
+ this.txt_kQty.Tag = "readonly";
+ //
+ // txt_yQty
+ //
+ this.txt_yQty.Location = new System.Drawing.Point(99, 44);
+ 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(219, 24);
+ this.txt_yQty.StyleController = this.layoutMx99;
+ this.txt_yQty.TabIndex = 470;
+ this.txt_yQty.Tag = "readonly";
+ //
+ // txt_zQty
+ //
+ 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(219, 24);
+ this.txt_zQty.StyleController = this.layoutMx99;
+ this.txt_zQty.TabIndex = 474;
+ //
+ // layoutControlGroup1
+ //
+ this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup1.GroupBordersVisible = false;
+ this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem23,
+ this.layoutControlItem35,
+ this.layoutControlItem26,
+ this.layoutControlItem22,
+ this.layoutControlItem21,
+ this.layoutControlItem24,
+ this.layoutControlItem38,
+ this.layoutControlItem36});
+ this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup1.Name = "Root";
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ columnDefinition11.Width = 20D;
+ this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition7,
+ columnDefinition8,
+ columnDefinition9,
+ columnDefinition10,
+ columnDefinition11});
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition8,
+ rowDefinition9});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1280, 84);
+ this.layoutControlGroup1.TextVisible = false;
+ //
+ // layoutControlItem23
+ //
+ 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(310, 0);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem23.Size = new System.Drawing.Size(310, 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(930, 0);
+ this.layoutControlItem35.MaxSize = new System.Drawing.Size(240, 28);
+ this.layoutControlItem35.MinSize = new System.Drawing.Size(240, 28);
+ this.layoutControlItem35.Name = "layoutControlItem35";
+ this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
+ this.layoutControlItem35.Size = new System.Drawing.Size(310, 32);
+ this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem35.Text = "鑷姩璁＄畻";
+ this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem35.TextVisible = false;
+ //
+ // layoutControlItem26
+ //
+ 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(930, 32);
+ this.layoutControlItem26.Name = "layoutControlItem26";
+ this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
+ this.layoutControlItem26.Size = new System.Drawing.Size(310, 32);
+ this.layoutControlItem26.Text = "鎶ュ伐鎵撳嵃";
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem26.TextVisible = false;
+ //
+ // layoutControlItem22
+ //
+ this.layoutControlItem22.AppearanceItemCaption.Options.UseTextOptions = true;
+ this.layoutControlItem22.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.layoutControlItem22.Control = this.txt_yQty;
+ 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(310, 32);
+ this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.AppearanceItemCaption.Options.UseTextOptions = true;
+ this.layoutControlItem21.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.layoutControlItem21.Control = this.txt_printRemark;
+ this.layoutControlItem21.Location = new System.Drawing.Point(310, 32);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem21.Size = new System.Drawing.Size(310, 32);
+ this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem24
+ //
+ this.layoutControlItem24.AppearanceItemCaption.Options.UseTextOptions = true;
+ 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(620, 0);
+ this.layoutControlItem24.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem24.Size = new System.Drawing.Size(310, 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(620, 32);
+ this.layoutControlItem38.Name = "layoutControlItem38";
+ this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem38.Size = new System.Drawing.Size(310, 32);
+ this.layoutControlItem38.Text = "鎵撳嵃鏁伴噺";
+ this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem38.TextVisible = false;
+ //
+ // layoutControlItem36
+ //
+ 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(310, 32);
+ this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
+ this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
+ //
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.Location = new System.Drawing.Point(0, 82);
+ this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMx2.Size = new System.Drawing.Size(1265, 399);
+ this.gcMx2.Size = new System.Drawing.Size(1265, 386);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1950,6 +2300,7 @@
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx2.OptionsView.ShowFooter = true;
this.gvMx2.OptionsView.ShowGroupPanel = false;
//
// gvMx2guid
@@ -2003,6 +2354,8 @@
this.gvMx2quantity.FieldName = "quantity";
this.gvMx2quantity.MinWidth = 50;
this.gvMx2quantity.Name = "gvMx2quantity";
+ this.gvMx2quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣锛歿0:0.##}")});
this.gvMx2quantity.Tag = "query_a.QUANTITY";
this.gvMx2quantity.Visible = true;
this.gvMx2quantity.VisibleIndex = 3;
@@ -2139,272 +2492,13 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
- // panMx99
- //
- this.panMx99.Controls.Add(this.layoutMx99);
- this.panMx99.Dock = System.Windows.Forms.DockStyle.Top;
- this.panMx99.Location = new System.Drawing.Point(0, 0);
- this.panMx99.Name = "panMx99";
- this.panMx99.Size = new System.Drawing.Size(1265, 82);
- this.panMx99.TabIndex = 1;
- //
- // layoutMx99
- //
- this.layoutMx99.Controls.Add(this.radOut);
- this.layoutMx99.Controls.Add(this.ucBtnPrint1);
- this.layoutMx99.Controls.Add(this.txt_iCount_1);
- this.layoutMx99.Controls.Add(this.txt_psnQty_1);
- this.layoutMx99.Controls.Add(this.txt_printRemark);
- this.layoutMx99.Controls.Add(this.txt_kQty);
- this.layoutMx99.Controls.Add(this.txt_yQty);
- this.layoutMx99.Controls.Add(this.txt_zQty);
- this.layoutMx99.Dock = System.Windows.Forms.DockStyle.Fill;
- this.layoutMx99.Location = new System.Drawing.Point(0, 0);
- this.layoutMx99.Name = "layoutMx99";
- this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(256, 530, 812, 500);
- this.layoutMx99.Root = this.layoutControlGroup1;
- this.layoutMx99.Size = new System.Drawing.Size(1265, 82);
- this.layoutMx99.TabIndex = 0;
- this.layoutMx99.Text = "layoutControl1";
- //
- // radOut
- //
- this.radOut.Location = new System.Drawing.Point(853, 10);
- this.radOut.Margin = new System.Windows.Forms.Padding(0);
- this.radOut.Name = "radOut";
- this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
- this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
- new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄨ嚜鍔�"),
- new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍗婅嚜鍔�"),
- new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩")});
- this.radOut.Size = new System.Drawing.Size(248, 31);
- this.radOut.StyleController = this.layoutMx99;
- this.radOut.TabIndex = 473;
- //
- // ucBtnPrint1
- //
- this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(851, 41);
- this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
- this.ucBtnPrint1.Name = "ucBtnPrint1";
- this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(278, 31);
- this.ucBtnPrint1.TabIndex = 464;
- //
- // txt_iCount_1
- //
- this.txt_iCount_1.Location = new System.Drawing.Point(659, 43);
- this.txt_iCount_1.Name = "txt_iCount_1";
- this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
- this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(189, 24);
- this.txt_iCount_1.StyleController = this.layoutMx99;
- this.txt_iCount_1.TabIndex = 332;
- this.txt_iCount_1.Tag = "readOnly-1";
- //
- // txt_psnQty_1
- //
- this.txt_psnQty_1.Location = new System.Drawing.Point(659, 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(189, 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(379, 43);
- this.txt_printRemark.Name = "txt_printRemark";
- this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_printRemark.Size = new System.Drawing.Size(189, 24);
- this.txt_printRemark.StyleController = this.layoutMx99;
- this.txt_printRemark.TabIndex = 334;
- this.txt_printRemark.Tag = "readOnly-1";
- //
- // txt_kQty
- //
- this.txt_kQty.EditValue = "";
- this.txt_kQty.Location = new System.Drawing.Point(379, 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(189, 24);
- this.txt_kQty.StyleController = this.layoutMx99;
- this.txt_kQty.TabIndex = 472;
- this.txt_kQty.Tag = "readonly";
- //
- // txt_yQty
- //
- this.txt_yQty.Location = new System.Drawing.Point(99, 43);
- 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(189, 24);
- this.txt_yQty.StyleController = this.layoutMx99;
- this.txt_yQty.TabIndex = 470;
- this.txt_yQty.Tag = "readonly";
- //
- // txt_zQty
- //
- 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(189, 24);
- this.txt_zQty.StyleController = this.layoutMx99;
- this.txt_zQty.TabIndex = 474;
- //
- // layoutControlGroup1
- //
- this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- this.layoutControlGroup1.GroupBordersVisible = false;
- this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem23,
- this.layoutControlItem25,
- this.layoutControlItem35,
- this.layoutControlItem26,
- this.layoutControlItem22,
- this.layoutControlItem36,
- this.layoutControlItem21,
- this.layoutControlItem24});
- this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
- this.layoutControlGroup1.Name = "Root";
- 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.Percent;
- columnDefinition23.Width = 100D;
- columnDefinition24.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition24.Width = 125D;
- this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition20,
- columnDefinition21,
- columnDefinition22,
- columnDefinition23,
- columnDefinition24});
- rowDefinition16.Height = 100D;
- rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition17.Height = 100D;
- rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
- this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition16,
- rowDefinition17});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1265, 82);
- this.layoutControlGroup1.TextVisible = false;
- //
- // layoutControlItem23
- //
- 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(280, 0);
- this.layoutControlItem23.Name = "layoutControlItem23";
- this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(280, 31);
- this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem25
- //
- this.layoutControlItem25.AppearanceItemCaption.Options.UseTextOptions = true;
- this.layoutControlItem25.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.layoutControlItem25.Control = this.txt_iCount_1;
- this.layoutControlItem25.Location = new System.Drawing.Point(560, 31);
- this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem25.Size = new System.Drawing.Size(280, 31);
- this.layoutControlItem25.Text = "鎵撳嵃寮犳暟";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem35
- //
- this.layoutControlItem35.Control = this.radOut;
- this.layoutControlItem35.Location = new System.Drawing.Point(840, 0);
- this.layoutControlItem35.MaxSize = new System.Drawing.Size(251, 0);
- this.layoutControlItem35.MinSize = new System.Drawing.Size(221, 20);
- this.layoutControlItem35.Name = "layoutControlItem35";
- this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem35.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
- this.layoutControlItem35.Size = new System.Drawing.Size(405, 31);
- this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem35.Text = "鑷姩璁＄畻";
- this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem35.TextVisible = false;
- //
- // layoutControlItem26
- //
- 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(840, 31);
- this.layoutControlItem26.Name = "layoutControlItem26";
- this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
- this.layoutControlItem26.Size = new System.Drawing.Size(280, 31);
- this.layoutControlItem26.Text = "鎶ュ伐鎵撳嵃";
- this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem26.TextVisible = false;
- //
- // layoutControlItem22
- //
- this.layoutControlItem22.AppearanceItemCaption.Options.UseTextOptions = true;
- this.layoutControlItem22.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.layoutControlItem22.Control = this.txt_yQty;
- this.layoutControlItem22.Location = new System.Drawing.Point(0, 31);
- this.layoutControlItem22.Name = "layoutControlItem22";
- this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(280, 31);
- this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem36
- //
- 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(280, 31);
- this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
- this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem21
- //
- this.layoutControlItem21.AppearanceItemCaption.Options.UseTextOptions = true;
- this.layoutControlItem21.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.layoutControlItem21.Control = this.txt_printRemark;
- this.layoutControlItem21.Location = new System.Drawing.Point(280, 31);
- this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(280, 31);
- this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem24
- //
- this.layoutControlItem24.AppearanceItemCaption.Options.UseTextOptions = true;
- 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(560, 0);
- this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem24.Size = new System.Drawing.Size(280, 31);
- this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
//
// xtraTabPage3
//
@@ -2444,6 +2538,7 @@
this.gvMx3.Name = "gvMx3";
this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx3.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx3.OptionsView.ShowFooter = true;
this.gvMx3.OptionsView.ShowGroupPanel = false;
//
// gridColumn33
@@ -2487,6 +2582,8 @@
this.gridColumn37.FieldName = "quantity";
this.gridColumn37.MinWidth = 50;
this.gridColumn37.Name = "gridColumn37";
+ this.gridColumn37.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣锛歿0:0.##}")});
this.gridColumn37.Tag = "query_a.QUANTITY";
this.gridColumn37.Visible = true;
this.gridColumn37.VisibleIndex = 2;
@@ -2628,29 +2725,29 @@
this.layoutControlItem37});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "Root";
- columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition25.Width = 100D;
- columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition26.Width = 100D;
- columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition27.Width = 100D;
- columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition28.Width = 100D;
- columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition29.Width = 100D;
- columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition30.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
+ columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition13.Width = 100D;
+ columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition14.Width = 100D;
+ columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15.Width = 100D;
+ columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition16.Width = 100D;
+ columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition17.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition25,
- columnDefinition26,
- columnDefinition27,
- columnDefinition28,
- columnDefinition29,
- columnDefinition30});
- rowDefinition18.Height = 100D;
- rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12,
+ columnDefinition13,
+ columnDefinition14,
+ columnDefinition15,
+ columnDefinition16,
+ columnDefinition17});
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition18});
+ rowDefinition10});
this.layoutControlGroup2.Size = new System.Drawing.Size(1265, 54);
this.layoutControlGroup2.TextVisible = false;
//
@@ -2753,6 +2850,7 @@
this.gvMx4.Name = "gvMx4";
this.gvMx4.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx4.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx4.OptionsView.ShowFooter = true;
this.gvMx4.OptionsView.ShowGroupPanel = false;
//
// gridColumn39
@@ -2796,6 +2894,8 @@
this.gridColumn44.FieldName = "quantity";
this.gridColumn44.MinWidth = 50;
this.gridColumn44.Name = "gridColumn44";
+ this.gridColumn44.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣锛歿0:0.##}")});
this.gridColumn44.Tag = "query_a.QUANTITY";
this.gridColumn44.Visible = true;
this.gridColumn44.VisibleIndex = 2;
@@ -2944,14 +3044,22 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
this.tabMxPage2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- this.panMx99.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx99.Panel1)).EndInit();
+ this.splitMx99.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx99.Panel2)).EndInit();
+ this.splitMx99.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx99)).EndInit();
+ this.splitMx99.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx99)).EndInit();
this.layoutMx99.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layShuLiang)).EndInit();
+ this.layShuLiang.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
@@ -2959,13 +3067,16 @@
((System.ComponentModel.ISupportInitialize)(this.txt_zQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
@@ -3129,7 +3240,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
- private System.Windows.Forms.Panel panMx99;
private DevExpress.XtraLayout.LayoutControl layoutMx99;
private DevExpress.XtraEditors.TextEdit txt_printRemark;
private DevExpress.XtraEditors.TextEdit txt_kQty;
@@ -3137,7 +3247,6 @@
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private UserControl.UcBtnPrint ucBtnPrint1;
- private DevExpress.XtraEditors.TextEdit txt_iCount_1;
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
@@ -3168,7 +3277,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraEditors.RadioGroup radOut;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
private DevExpress.XtraTab.XtraTabPage xtraTabPage4;
@@ -3186,7 +3294,6 @@
private UserControl.UcBtnPrint ucBtnPrint100;
private DevExpress.XtraEditors.TextEdit txt_zQty;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
private DevExpress.XtraEditors.TextEdit txt_zQty98;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
@@ -3196,5 +3303,14 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
+ private DevExpress.XtraDataLayout.DataLayoutControl layShuLiang;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
+ private DevExpress.XtraEditors.TextEdit txt_iCount_1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
+ private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx99;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 3cdc7e1..9a8890b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -50,7 +50,7 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //杩欐槸鍗℃澘鐮�
+ //杩欐槸鎵樻澘鐮�
this.ucBtnPrint1.btnDesignClick += (s, e) =>
{
ucBtnPrint1.rptParameter = "rpt_daa{}";
@@ -58,6 +58,14 @@
this.ucBtnPrint1.btnReportClick += (s, e) =>
{
_print();
+ };
+ txt_psnQty_1.TextChanged += (s, e) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut,txt_yuliang_1);
+ };
+ radOut.SelectedIndexChanged += (s, e) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
//杩欐槸杩芥函鐮�
this.ucBtnPrint98.btnDesignClick += (s, e) =>
@@ -76,15 +84,6 @@
this.ucBtnPrint100.btnReportClick += (s, e) =>
{
_print100();
- };
- txt_psnQty_1.TextChanged += (s, e) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
- };
-
- radOut.SelectedIndexChanged += (s, e) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
};
}
@@ -481,8 +480,7 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx4, gvMx4);
}
- txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = "";
- radOut.Properties.Items[0].Description = "鍏ㄨ嚜鍔�";
+ txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text="";
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -610,7 +608,7 @@
this.ucBtnPrint1.rptParameter = "rpt_daa{"
+ txt_printRemark.Text.Trim()
+ "," + ""
- + "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString()
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal( txt_yuliang_1.Text.Trim())
+ "," + txt_iCount_1.Text.Trim()
+ "," + txt_psnQty_1.Text.Trim()
+ "}";
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx
index a4826a3..25d6b3c 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.resx
@@ -120,4 +120,7 @@
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>25</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
index fc3da1b..4ec4dfb 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -129,6 +129,7 @@
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
this.splitMx1.Panel1.SuspendLayout();
@@ -196,7 +197,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -1069,7 +1070,8 @@
this.gridColumn19,
this.gridColumn20,
this.gridColumn21,
- this.gridColumn22});
+ this.gridColumn22,
+ this.gridColumn23});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1214,6 +1216,16 @@
this.gridColumn22.VisibleIndex = 11;
this.gridColumn22.Width = 94;
//
+ // gridColumn23
+ //
+ this.gridColumn23.Caption = "涓嶈壇椤圭洰";
+ this.gridColumn23.FieldName = "badReson";
+ this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.Visible = true;
+ this.gridColumn23.VisibleIndex = 12;
+ this.gridColumn23.Width = 94;
+ //
// Frm_Work01
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1224,7 +1236,7 @@
this.MinimizeBox = false;
this.Name = "Frm_Work01";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "宸ュ簭閲囬泦-鎶曞叆";
+ this.Text = "宸ュ簭閲囬泦";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
this.splitMx1.Panel1.ResumeLayout(false);
@@ -1386,5 +1398,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index a111ee1..105ff5e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -1,4 +1,5 @@
-锘縰sing Gs.DevApp.Entity;
+锘縰sing DevExpress.Utils.MVVM.Services;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -33,19 +34,42 @@
};
btnBad.Click += (s, e) =>
{
- getModel("", badTag);
+ UcDictionarySelect frm = new UcDictionarySelect("缂洪櫡鎻忚堪", " s_type='宸ュ簭閲囬泦涓嶈壇椤圭洰'");
+ frm.UpdateParent += (ss, ee) =>
+ {
+ System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
+ var lst = ee.DynamicList;
+ foreach (dynamic dym in lst)
+ {
+ if (stringBuilder.Length > 0)
+ stringBuilder.Append("|");
+ stringBuilder.Append(dym.dicTxt);
+ }
+ string _txt = stringBuilder.ToString();
+ if (string.IsNullOrEmpty(_txt))
+ {
+ Toast vm = new Toast(-1, "~褰撲负涓嶈壇鏃讹紝璇烽�夋嫨涓嶈壇椤圭洰~");
+ vm.Show();
+ }
+ else
+ getModel("", badTag, _txt);
+ };
+ frm.ShowDialog();
};
}
+
+
/// <summary>
///
/// </summary>
/// <param name="_checkVal">妫�娴嬪��</param>
/// <param name="_checkResult">妫�娴嬬粨鏋�</param>
- private void getModel(string _checkVal, string _checkResult)
+ /// <param name="_badReson">涓嶈壇鍘熷洜</param>
+ /// <param name="_inBz">澶囨敞</param>
+ private void getModel(string _checkVal, string _checkResult, string _badReson = "", string _inBz = "")
{
string _barCode = txt_barCode.Text.Trim();
- string _inBz = ""; ; //澶囨敞
if (string.IsNullOrEmpty(_barCode))
{
Toast vm = new Toast(-1, "~璇峰厛鎵拷婧爜~");
@@ -55,12 +79,13 @@
var _obj = new
{
barCode = _barCode,
- inBz = _inBz,
+ inBz = _inBz.Trim(),
checkVal = _checkVal,
checkResult = _checkResult,
processNo = txt_gx.Text.Trim(),//宸ュ簭
banCi = txt_bc.Text.Trim(),//鐝
gongWei = txt_gw.Text.Trim(),//宸ヤ綅
+ badReson = _badReson.Trim()
};
try
{
@@ -69,12 +94,14 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
+ //澶磋〃鍜屾眹鎬�
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, false);
lbSum1.Text = dy.lbSum1;
lbSum2.Text = dy.lbSum2;
lbSum3.Text = dy.lbSum3;
lbSum4.Text = dy.lbSum4;
prog1.Position = dy.jd;
+ //鑹搧
txt_barCode.ReadOnly = false;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
@@ -95,6 +122,7 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
+ //涓嶈壇鍝�
JArray array2 = new JArray();
foreach (var a in _job["rtnData"]["list2"])
{
@@ -126,7 +154,6 @@
Toast vm = new Toast(-1, _rtn.rtnMsg);
vm.Show();
}
-
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
index 9f8dcb8..3a45a19 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
@@ -119,6 +119,7 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -976,6 +977,7 @@
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1daa002,
this.gvMx1daa010,
+ this.gridColumn5,
this.gvMx1daa003,
this.gridColumn1,
this.gvMx1daa004,
@@ -1008,7 +1010,7 @@
// gvMx1daa010
//
this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa010.Caption = "宸ュ簭浠ｇ爜:鍚嶇О";
+ this.gvMx1daa010.Caption = "宸ュ簭浠ｇ爜";
this.gvMx1daa010.FieldName = "processNo";
this.gvMx1daa010.MinWidth = 50;
this.gvMx1daa010.Name = "gvMx1daa010";
@@ -1033,7 +1035,7 @@
this.gvMx1daa003.OptionsColumn.ReadOnly = true;
this.gvMx1daa003.Tag = "edit";
this.gvMx1daa003.Visible = true;
- this.gvMx1daa003.VisibleIndex = 2;
+ this.gvMx1daa003.VisibleIndex = 3;
this.gvMx1daa003.Width = 114;
//
// repositoryItemComboBox1
@@ -1061,7 +1063,7 @@
this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Tag = "edit";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.VisibleIndex = 4;
this.gridColumn1.Width = 92;
//
// repositoryItemComboBox2
@@ -1094,7 +1096,7 @@
this.gvMx1daa004.OptionsColumn.ReadOnly = true;
this.gvMx1daa004.Tag = "edit";
this.gvMx1daa004.Visible = true;
- this.gvMx1daa004.VisibleIndex = 4;
+ this.gvMx1daa004.VisibleIndex = 5;
this.gvMx1daa004.Width = 150;
//
// rptGx
@@ -1119,7 +1121,7 @@
this.gvMx1reporttime.OptionsColumn.ReadOnly = true;
this.gvMx1reporttime.Tag = "edit";
this.gvMx1reporttime.Visible = true;
- this.gvMx1reporttime.VisibleIndex = 5;
+ this.gvMx1reporttime.VisibleIndex = 6;
this.gvMx1reporttime.Width = 89;
//
// gvMxDel
@@ -1130,7 +1132,7 @@
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.OptionsColumn.ReadOnly = true;
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 6;
+ this.gvMxDel.VisibleIndex = 7;
this.gvMxDel.Width = 65;
//
// repositoryItemButtonEdit1
@@ -1162,6 +1164,16 @@
this.picCheckBox.TabIndex = 9;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "宸ュ簭鍚嶇О";
+ this.gridColumn5.FieldName = "processName";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 2;
+ this.gridColumn5.Width = 94;
//
// Frm_WorkTechnique
//
@@ -1323,5 +1335,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
index dfac085..fe9c91c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -62,8 +62,8 @@
_row["fSeq"] = dym.fSeq;
_row["statStatus"] = "Y-鏄�";
_row["collectionName"] = "绌�";
- _row["processNo"] = dym.processNo+":"+ dym.processName;
- //_row["processName"] = dym.processName;
+ _row["processNo"] = dym.processNo;
+ _row["processName"] = dym.processName;
_Table.Rows.Add(_row);
}
gcMx1.BindingContext = new BindingContext();
@@ -515,7 +515,7 @@
rptGx.Items.Add("绌�");
foreach (DataRow dr in dt.Rows)
{
- rptGx.Items.Add(dr["processNo"].ToString()+":"+ dr["processName"].ToString());
+ rptGx.Items.Add(dr["processNo"].ToString());
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 451a40b..5eafab2 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1812,7 +1812,7 @@
}
}
- gridView1.IndicatorWidth = 50;
+ gridView1.IndicatorWidth = 60;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
if (e.Info.IsRowIndicator && e.RowHandle >= 0)
@@ -2042,7 +2042,7 @@
gridView1.OptionsFind.ShowSearchNavButtons = false;
gridView1.OptionsView.ShowAutoFilterRow = false;
gridView1.OptionsView.ShowGroupPanel = false;
- gridView1.IndicatorWidth = 40;
+ gridView1.IndicatorWidth = 60;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
if (e.Info.IsRowIndicator && e.RowHandle >= 0)
@@ -2113,7 +2113,7 @@
return true;
return false;
}
- public static void PrintJiSuan(DevExpress.XtraEditors.TextEdit box1, DevExpress.XtraEditors.TextEdit box2, string sum, DevExpress.XtraEditors.RadioGroup rd)
+ public static void PrintJiSuan(DevExpress.XtraEditors.TextEdit box1, DevExpress.XtraEditors.TextEdit box2, string sum, DevExpress.XtraEditors.RadioGroup rd, DevExpress.XtraEditors.TextEdit txt_yuliang = null)
{
if (rd.SelectedIndex == 2)
return;
@@ -2135,20 +2135,19 @@
box2.Text = quotient.ToString();
if (rd.SelectedIndex == 0)
- rd.Properties.Items[0].Description = "鍏ㄨ嚜鍔ㄣ��" + remainder.ToString() + "銆�";
+ txt_yuliang.Text = remainder.ToString();
}
catch (Exception ex)
{
-
Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
}
}
- public static void PrintAuto(DevExpress.XtraEditors.TextEdit txt_psnQty_1, DevExpress.XtraEditors.TextEdit txt_iCount_1, DevExpress.XtraEditors.RadioGroup radOut)
+ public static void PrintAuto(DevExpress.XtraEditors.TextEdit txt_psnQty_1, DevExpress.XtraEditors.TextEdit txt_iCount_1, DevExpress.XtraEditors.RadioGroup radOut, DevExpress.XtraEditors.TextEdit txt_yuliang = null)
{
txt_psnQty_1.Text = "";
txt_iCount_1.Text = "";
- radOut.Properties.Items[0].Description = "鍏ㄨ嚜鍔�";
+ txt_yuliang.Text = "";
if (radOut.SelectedIndex == 2)
txt_iCount_1.ReadOnly = false;
else
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookPrint.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookPrint.Designer.cs
index 131124c..ed20339 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookPrint.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookPrint.Designer.cs
@@ -45,12 +45,11 @@
this.lookSearchSupplier.EditValue = "璇烽�夋嫨";
this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0);
this.lookSearchSupplier.Name = "lookSearchSupplier";
-
this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true;
this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View;
- this.lookSearchSupplier.Size = new System.Drawing.Size(327, 28);
+ this.lookSearchSupplier.Size = new System.Drawing.Size(327, 24);
this.lookSearchSupplier.TabIndex = 12;
//
// searchLookUpEdit1View
--
Gitblit v1.9.3