From 87dcde0bc10092a35a4c775316a72a312646d3df Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 11 四月 2025 17:39:52 +0800
Subject: [PATCH] 打印后盖码
---
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 106 +++++++
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 648 +++++++++++++++++++++++++++++++++----------------
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 1
4 files changed, 541 insertions(+), 218 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 09d6be2..2d4703e 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 81d11b6..ac7360f 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -50,14 +50,14 @@
DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
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.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -129,6 +129,7 @@
this.txt_daa003 = new DevExpress.XtraEditors.TextEdit();
this.txt_dwName = new DevExpress.XtraEditors.TextEdit();
this.txt_daa004 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_daa015 = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -150,6 +151,9 @@
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -205,6 +209,7 @@
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();
@@ -217,6 +222,7 @@
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx3 = new DevExpress.XtraGrid.GridControl();
@@ -242,11 +248,20 @@
this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx4 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn41 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn44 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn45 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn46 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.panMx100 = new System.Windows.Forms.Panel();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.txt_daa015 = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.ucBtnPrint100 = new Gs.DevApp.UserControl.UcBtnPrint();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -287,6 +302,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa004.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -308,6 +324,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -320,6 +339,7 @@
this.panMx99.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx99)).BeginInit();
this.layoutMx99.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).BeginInit();
@@ -331,6 +351,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
@@ -348,10 +369,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ this.xtraTabPage4.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
+ this.panMx100.SuspendLayout();
this.SuspendLayout();
//
// toolBarMenu1
@@ -365,7 +386,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1269, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -376,7 +397,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 740);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1269, 740);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -386,7 +407,7 @@
//
this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 708);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1267, 708);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -405,7 +426,7 @@
// split1.Panel2
//
this.split1.Panel2.Text = "Panel2";
- this.split1.Size = new System.Drawing.Size(1126, 708);
+ this.split1.Size = new System.Drawing.Size(1267, 708);
this.split1.SplitterPosition = 696;
this.split1.TabIndex = 0;
//
@@ -415,7 +436,7 @@
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1126, 657);
+ this.gcMain1.Size = new System.Drawing.Size(1267, 657);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -949,7 +970,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1267, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -957,7 +978,7 @@
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 708);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1267, 708);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -976,7 +997,7 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
- this.splitMx1.Size = new System.Drawing.Size(1126, 708);
+ this.splitMx1.Size = new System.Drawing.Size(1267, 708);
this.splitMx1.SplitterPosition = 183;
this.splitMx1.TabIndex = 0;
//
@@ -1012,7 +1033,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(910, 530, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 183);
+ this.layoutMx1.Size = new System.Drawing.Size(1267, 183);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -1027,213 +1048,221 @@
//
// txt_daa009
//
- this.txt_daa009.Location = new System.Drawing.Point(385, 147);
+ 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(436, 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(656, 119);
+ 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(165, 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";
//
// txt_daa001
//
- this.txt_daa001.Location = new System.Drawing.Point(114, 7);
+ 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(165, 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(385, 35);
+ 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(165, 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(656, 7);
+ 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(165, 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";
//
// txt_saleOrderNo
//
- this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 63);
+ 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(165, 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(385, 63);
+ 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(165, 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(927, 35);
+ 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(166, 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";
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(114, 35);
+ 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(165, 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(385, 7);
+ 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(165, 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(656, 35);
+ 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(165, 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(927, 63);
+ 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(166, 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(656, 63);
+ 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(165, 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(656, 91);
+ 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(165, 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(927, 91);
+ 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(166, 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";
//
// txt_daa029
//
- this.txt_daa029.Location = new System.Drawing.Point(114, 91);
+ 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(165, 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(385, 91);
+ 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(165, 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(927, 119);
+ 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(166, 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";
//
// txt_daa003
//
- this.txt_daa003.Location = new System.Drawing.Point(114, 147);
+ 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(165, 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(927, 7);
+ 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(166, 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";
//
// txt_daa004
//
- this.txt_daa004.Location = new System.Drawing.Point(114, 119);
+ 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(165, 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(420, 124);
+ this.txt_daa015.Name = "txt_daa015";
+ this.txt_daa015.Size = new System.Drawing.Size(200, 24);
+ this.txt_daa015.StyleController = this.layoutMx1;
+ this.txt_daa015.TabIndex = 473;
//
// layoutControlItem29
//
@@ -1308,7 +1337,7 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1105, 188);
+ this.Root.Size = new System.Drawing.Size(1246, 188);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1316,17 +1345,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(271, 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(542, 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(271, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1336,18 +1365,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(271, 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(542, 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(271, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1357,29 +1386,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(271, 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(271, 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(271, 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(542, 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(271, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem11.Text = "宸茬敓浜ч噺";
this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1389,18 +1418,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(271, 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(271, 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(271, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem14.Text = "鐢熶骇绾垮埆";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1410,7 +1439,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(271, 28);
+ this.layoutControlItem17.Size = new System.Drawing.Size(306, 28);
this.layoutControlItem17.Text = "浜у搧瑙勬牸";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1420,96 +1449,130 @@
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(271, 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(271, 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(271, 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(271, 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(271, 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(813, 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(272, 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(813, 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(272, 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(813, 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(272, 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(813, 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(272, 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(813, 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(272, 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(271, 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(542, 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(306, 112);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem27.Size = new System.Drawing.Size(306, 28);
+ this.layoutControlItem27.Text = "鐢熶骇绾垮埆ID";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_dptName;
+ 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(306, 28);
+ this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_daa013;
+ this.layoutControlItem18.CustomizationFormText = "鐢熶骇杞﹂棿ID";
+ 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(306, 28);
+ this.layoutControlItem18.Text = "杞﹂棿ID";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -1517,18 +1580,19 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 513);
+ this.tabMx.Size = new System.Drawing.Size(1267, 513);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
this.tabMxPage2,
- this.xtraTabPage3});
+ this.xtraTabPage3,
+ this.xtraTabPage4});
//
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 481);
+ this.tabMxPage1.Size = new System.Drawing.Size(1265, 481);
this.tabMxPage1.Text = "澶囨枡鍗曡韩";
//
// gcMx1
@@ -1537,7 +1601,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 481);
+ this.gcMx1.Size = new System.Drawing.Size(1265, 481);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1881,18 +1945,18 @@
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Controls.Add(this.panMx99);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 481);
+ this.tabMxPage2.Size = new System.Drawing.Size(1265, 481);
this.tabMxPage2.Text = "鎵樻澘鐮佹槑缁�";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.Location = new System.Drawing.Point(0, 54);
+ this.gcMx2.Location = new System.Drawing.Point(0, 82);
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(1124, 427);
+ this.gcMx2.Size = new System.Drawing.Size(1265, 399);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2128,11 +2192,12 @@
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(1124, 54);
+ 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);
@@ -2142,48 +2207,61 @@
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(288, 465, 812, 500);
+ this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(429, 530, 812, 500);
this.layoutMx99.Root = this.layoutControlGroup1;
- this.layoutMx99.Size = new System.Drawing.Size(1124, 54);
+ 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(813, 10);
+ this.radOut.Margin = new System.Windows.Forms.Padding(0);
+ this.radOut.Name = "radOut";
+ 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(352, 28);
+ this.radOut.StyleController = this.layoutMx99;
+ this.radOut.TabIndex = 473;
//
// ucBtnPrint1
//
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(931, 10);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(812, 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(182, 34);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(265, 31);
this.ucBtnPrint1.TabIndex = 464;
//
// txt_iCount_1
//
- this.txt_iCount_1.Location = new System.Drawing.Point(835, 12);
+ this.txt_iCount_1.Location = new System.Drawing.Point(633, 43);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(93, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(176, 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(651, 12);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(366, 43);
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(93, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(176, 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(467, 12);
+ this.txt_printRemark.Location = new System.Drawing.Point(633, 12);
this.txt_printRemark.Name = "txt_printRemark";
this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_printRemark.Size = new System.Drawing.Size(93, 24);
+ this.txt_printRemark.Size = new System.Drawing.Size(176, 24);
this.txt_printRemark.StyleController = this.layoutMx99;
this.txt_printRemark.TabIndex = 334;
this.txt_printRemark.Tag = "readOnly-1";
@@ -2191,11 +2269,11 @@
// txt_kQty
//
this.txt_kQty.EditValue = "";
- this.txt_kQty.Location = new System.Drawing.Point(283, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(366, 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(93, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(176, 24);
this.txt_kQty.StyleController = this.layoutMx99;
this.txt_kQty.TabIndex = 472;
this.txt_kQty.Tag = "readonly";
@@ -2206,7 +2284,7 @@
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(93, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(176, 24);
this.txt_yQty.StyleController = this.layoutMx99;
this.txt_yQty.TabIndex = 470;
this.txt_yQty.Tag = "readonly";
@@ -2221,6 +2299,7 @@
this.layoutControlItem21,
this.layoutControlItem24,
this.layoutControlItem25,
+ this.layoutControlItem35,
this.layoutControlItem26});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
@@ -2232,22 +2311,22 @@
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;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ columnDefinition9.Width = 177D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition5,
columnDefinition6,
columnDefinition7,
columnDefinition8,
- columnDefinition9,
- columnDefinition10});
+ columnDefinition9});
rowDefinition7.Height = 100D;
rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition7});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1124, 54);
+ rowDefinition7,
+ rowDefinition8});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1265, 82);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem22
@@ -2257,7 +2336,7 @@
this.layoutControlItem22.Control = this.txt_yQty;
this.layoutControlItem22.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem22.Name = "layoutControlItem22";
- this.layoutControlItem22.Size = new System.Drawing.Size(184, 34);
+ this.layoutControlItem22.Size = new System.Drawing.Size(267, 31);
this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2266,10 +2345,10 @@
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(184, 0);
+ this.layoutControlItem23.Location = new System.Drawing.Point(267, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(184, 34);
+ this.layoutControlItem23.Size = new System.Drawing.Size(267, 31);
this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2278,10 +2357,10 @@
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(368, 0);
+ this.layoutControlItem21.Location = new System.Drawing.Point(534, 0);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem21.Size = new System.Drawing.Size(184, 34);
+ this.layoutControlItem21.Size = new System.Drawing.Size(267, 31);
this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2291,10 +2370,11 @@
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(552, 0);
+ this.layoutControlItem24.Location = new System.Drawing.Point(267, 31);
this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem24.Size = new System.Drawing.Size(184, 34);
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem24.Size = new System.Drawing.Size(267, 31);
this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2303,23 +2383,41 @@
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(736, 0);
+ this.layoutControlItem25.Location = new System.Drawing.Point(534, 31);
this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem25.Size = new System.Drawing.Size(184, 34);
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem25.Size = new System.Drawing.Size(267, 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(801, 0);
+ this.layoutControlItem35.MaxSize = new System.Drawing.Size(354, 28);
+ this.layoutControlItem35.MinSize = new System.Drawing.Size(354, 20);
+ this.layoutControlItem35.Name = "layoutControlItem35";
+ this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem35.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
+ this.layoutControlItem35.Size = new System.Drawing.Size(444, 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(920, 0);
+ this.layoutControlItem26.Location = new System.Drawing.Point(801, 31);
this.layoutControlItem26.Name = "layoutControlItem26";
- this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 5;
+ 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(184, 34);
+ this.layoutControlItem26.Size = new System.Drawing.Size(267, 31);
this.layoutControlItem26.Text = "鎶ュ伐鎵撳嵃";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem26.TextVisible = false;
@@ -2329,7 +2427,7 @@
this.xtraTabPage3.Controls.Add(this.gcMx3);
this.xtraTabPage3.Controls.Add(this.panMx98);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1124, 481);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1265, 481);
this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�";
//
// gcMx3
@@ -2338,7 +2436,7 @@
this.gcMx3.Location = new System.Drawing.Point(0, 54);
this.gcMx3.MainView = this.gvMx3;
this.gcMx3.Name = "gcMx3";
- this.gcMx3.Size = new System.Drawing.Size(1124, 427);
+ this.gcMx3.Size = new System.Drawing.Size(1265, 427);
this.gcMx3.TabIndex = 1;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -2460,7 +2558,7 @@
this.panMx98.Dock = System.Windows.Forms.DockStyle.Top;
this.panMx98.Location = new System.Drawing.Point(0, 0);
this.panMx98.Name = "panMx98";
- this.panMx98.Size = new System.Drawing.Size(1124, 54);
+ this.panMx98.Size = new System.Drawing.Size(1265, 54);
this.panMx98.TabIndex = 0;
//
// layoutMx98
@@ -2475,18 +2573,18 @@
this.layoutMx98.Name = "layoutMx98";
this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(199, 178, 812, 500);
this.layoutMx98.Root = this.layoutControlGroup2;
- this.layoutMx98.Size = new System.Drawing.Size(1124, 54);
+ this.layoutMx98.Size = new System.Drawing.Size(1265, 54);
this.layoutMx98.TabIndex = 0;
this.layoutMx98.Text = "layoutControl1";
//
// ucBtnPrint98
//
this.ucBtnPrint98.guidKey = null;
- this.ucBtnPrint98.Location = new System.Drawing.Point(894, 10);
+ this.ucBtnPrint98.Location = new System.Drawing.Point(1007, 10);
this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint98.Name = "ucBtnPrint98";
this.ucBtnPrint98.rptParameter = null;
- this.ucBtnPrint98.Size = new System.Drawing.Size(219, 34);
+ this.ucBtnPrint98.Size = new System.Drawing.Size(247, 34);
this.ucBtnPrint98.TabIndex = 8;
//
// txt_yQty98
@@ -2494,32 +2592,32 @@
this.txt_yQty98.Location = new System.Drawing.Point(114, 12);
this.txt_yQty98.Name = "txt_yQty98";
this.txt_yQty98.Properties.ReadOnly = true;
- this.txt_yQty98.Size = new System.Drawing.Size(114, 24);
+ this.txt_yQty98.Size = new System.Drawing.Size(143, 24);
this.txt_yQty98.StyleController = this.layoutMx98;
this.txt_yQty98.TabIndex = 4;
//
// txt_kQty98
//
- this.txt_kQty98.Location = new System.Drawing.Point(334, 12);
+ this.txt_kQty98.Location = new System.Drawing.Point(363, 12);
this.txt_kQty98.Name = "txt_kQty98";
this.txt_kQty98.Properties.ReadOnly = true;
- this.txt_kQty98.Size = new System.Drawing.Size(115, 24);
+ this.txt_kQty98.Size = new System.Drawing.Size(143, 24);
this.txt_kQty98.StyleController = this.layoutMx98;
this.txt_kQty98.TabIndex = 5;
//
// txt_printRemark98
//
- this.txt_printRemark98.Location = new System.Drawing.Point(555, 12);
+ this.txt_printRemark98.Location = new System.Drawing.Point(612, 12);
this.txt_printRemark98.Name = "txt_printRemark98";
- this.txt_printRemark98.Size = new System.Drawing.Size(115, 24);
+ this.txt_printRemark98.Size = new System.Drawing.Size(143, 24);
this.txt_printRemark98.StyleController = this.layoutMx98;
this.txt_printRemark98.TabIndex = 6;
//
// txt_iCount_98
//
- this.txt_iCount_98.Location = new System.Drawing.Point(776, 12);
+ this.txt_iCount_98.Location = new System.Drawing.Point(861, 12);
this.txt_iCount_98.Name = "txt_iCount_98";
- this.txt_iCount_98.Size = new System.Drawing.Size(115, 24);
+ this.txt_iCount_98.Size = new System.Drawing.Size(143, 24);
this.txt_iCount_98.StyleController = this.layoutMx98;
this.txt_iCount_98.TabIndex = 7;
//
@@ -2535,6 +2633,8 @@
this.layoutControlItem34});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "Root";
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition11.Width = 100D;
columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -2543,19 +2643,17 @@
columnDefinition13.Width = 100D;
columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition14.Width = 100D;
- columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition15.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition10,
columnDefinition11,
columnDefinition12,
columnDefinition13,
- columnDefinition14,
- columnDefinition15});
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition14});
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition8});
- this.layoutControlGroup2.Size = new System.Drawing.Size(1124, 54);
+ rowDefinition9});
+ this.layoutControlGroup2.Size = new System.Drawing.Size(1265, 54);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem30
@@ -2563,99 +2661,206 @@
this.layoutControlItem30.Control = this.txt_yQty98;
this.layoutControlItem30.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem30.Name = "layoutControlItem30";
- this.layoutControlItem30.Size = new System.Drawing.Size(220, 34);
+ this.layoutControlItem30.Size = new System.Drawing.Size(249, 34);
this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem31
//
this.layoutControlItem31.Control = this.txt_kQty98;
- this.layoutControlItem31.Location = new System.Drawing.Point(220, 0);
+ this.layoutControlItem31.Location = new System.Drawing.Point(249, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem31.Size = new System.Drawing.Size(221, 34);
+ this.layoutControlItem31.Size = new System.Drawing.Size(249, 34);
this.layoutControlItem31.Text = "鍙墦鍗版暟閲�";
this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_printRemark98;
- this.layoutControlItem32.Location = new System.Drawing.Point(441, 0);
+ this.layoutControlItem32.Location = new System.Drawing.Point(498, 0);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem32.Size = new System.Drawing.Size(221, 34);
+ this.layoutControlItem32.Size = new System.Drawing.Size(249, 34);
this.layoutControlItem32.Text = "鎵撳嵃澶囨敞";
this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem33
//
this.layoutControlItem33.Control = this.txt_iCount_98;
- this.layoutControlItem33.Location = new System.Drawing.Point(662, 0);
+ this.layoutControlItem33.Location = new System.Drawing.Point(747, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem33.Size = new System.Drawing.Size(221, 34);
+ this.layoutControlItem33.Size = new System.Drawing.Size(249, 34);
this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.ucBtnPrint98;
- this.layoutControlItem34.Location = new System.Drawing.Point(883, 0);
+ this.layoutControlItem34.Location = new System.Drawing.Point(996, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 4;
this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
- this.layoutControlItem34.Size = new System.Drawing.Size(221, 34);
+ this.layoutControlItem34.Size = new System.Drawing.Size(249, 34);
this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem34.TextVisible = false;
//
- // txt_daa015
+ // xtraTabPage4
//
- this.txt_daa015.Location = new System.Drawing.Point(385, 119);
- this.txt_daa015.Name = "txt_daa015";
- this.txt_daa015.Size = new System.Drawing.Size(165, 24);
- this.txt_daa015.StyleController = this.layoutMx1;
- this.txt_daa015.TabIndex = 473;
+ this.xtraTabPage4.Controls.Add(this.gcMx4);
+ this.xtraTabPage4.Controls.Add(this.panMx100);
+ this.xtraTabPage4.Name = "xtraTabPage4";
+ this.xtraTabPage4.Size = new System.Drawing.Size(1265, 481);
+ this.xtraTabPage4.Text = "鍚庣洊鐮佹槑缁�";
//
- // layoutControlItem27
+ // gcMx4
//
- this.layoutControlItem27.Control = this.txt_daa015;
- this.layoutControlItem27.Location = new System.Drawing.Point(271, 112);
- this.layoutControlItem27.Name = "layoutControlItem27";
- this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem27.Size = new System.Drawing.Size(271, 28);
- this.layoutControlItem27.Text = "鐢熶骇绾垮埆ID";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx4.Location = new System.Drawing.Point(0, 54);
+ this.gcMx4.MainView = this.gvMx4;
+ this.gcMx4.Name = "gcMx4";
+ this.gcMx4.Size = new System.Drawing.Size(1265, 427);
+ this.gcMx4.TabIndex = 2;
+ this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx4});
//
- // layoutControlItem20
+ // gvMx4
//
- this.layoutControlItem20.Control = this.txt_dptName;
- this.layoutControlItem20.Location = new System.Drawing.Point(542, 84);
- this.layoutControlItem20.Name = "layoutControlItem20";
- this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(271, 28);
- this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ this.gvMx4.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMx4.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx4.Appearance.Row.Options.UseFont = true;
+ this.gvMx4.ColumnPanelRowHeight = 50;
+ this.gvMx4.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn39,
+ this.gridColumn40,
+ this.gridColumn41,
+ this.gridColumn44,
+ this.gridColumn45,
+ this.gridColumn46,
+ this.gridColumn47,
+ this.gridColumn48});
+ this.gvMx4.GridControl = this.gcMx4;
+ this.gvMx4.Name = "gvMx4";
+ this.gvMx4.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx4.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx4.OptionsView.ShowGroupPanel = false;
//
- // layoutControlItem18
+ // gridColumn39
//
- this.layoutControlItem18.Control = this.txt_daa013;
- this.layoutControlItem18.CustomizationFormText = "鐢熶骇杞﹂棿ID";
- this.layoutControlItem18.Location = new System.Drawing.Point(542, 112);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(271, 28);
- this.layoutControlItem18.Text = "杞﹂棿ID";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+ this.gridColumn39.AppearanceCell.Options.UseFont = true;
+ this.gridColumn39.Caption = "guid ";
+ this.gridColumn39.FieldName = "guid";
+ this.gridColumn39.MinWidth = 50;
+ this.gridColumn39.Name = "gridColumn39";
+ this.gridColumn39.Tag = "query_a.guid";
+ this.gridColumn39.Width = 94;
+ //
+ // gridColumn40
+ //
+ this.gridColumn40.AppearanceCell.Options.UseFont = true;
+ this.gridColumn40.Caption = "宸ュ崟鍙�";
+ this.gridColumn40.FieldName = "daa001";
+ this.gridColumn40.MinWidth = 50;
+ this.gridColumn40.Name = "gridColumn40";
+ this.gridColumn40.Tag = "query_a.UNIT";
+ this.gridColumn40.Visible = true;
+ this.gridColumn40.VisibleIndex = 0;
+ this.gridColumn40.Width = 94;
+ //
+ // gridColumn41
+ //
+ this.gridColumn41.AppearanceCell.Options.UseFont = true;
+ this.gridColumn41.Caption = "杩芥函鐮�";
+ this.gridColumn41.FieldName = "barCode";
+ this.gridColumn41.MinWidth = 50;
+ this.gridColumn41.Name = "gridColumn41";
+ this.gridColumn41.Tag = "query_a.ITEM_BARCODE";
+ this.gridColumn41.Visible = true;
+ this.gridColumn41.VisibleIndex = 1;
+ this.gridColumn41.Width = 94;
+ //
+ // gridColumn44
+ //
+ this.gridColumn44.AppearanceCell.Options.UseFont = true;
+ this.gridColumn44.Caption = "鏁伴噺 ";
+ this.gridColumn44.FieldName = "quantity";
+ this.gridColumn44.MinWidth = 50;
+ this.gridColumn44.Name = "gridColumn44";
+ this.gridColumn44.Tag = "query_a.QUANTITY";
+ this.gridColumn44.Visible = true;
+ this.gridColumn44.VisibleIndex = 2;
+ this.gridColumn44.Width = 94;
+ //
+ // gridColumn45
+ //
+ this.gridColumn45.AppearanceCell.Options.UseFont = true;
+ this.gridColumn45.Caption = "鍒涘缓浜� ";
+ this.gridColumn45.FieldName = "createBy";
+ this.gridColumn45.MinWidth = 50;
+ this.gridColumn45.Name = "gridColumn45";
+ this.gridColumn45.Tag = "query_a.CREATE_BY";
+ this.gridColumn45.Visible = true;
+ this.gridColumn45.VisibleIndex = 3;
+ this.gridColumn45.Width = 94;
+ //
+ // gridColumn46
+ //
+ this.gridColumn46.AppearanceCell.Options.UseFont = true;
+ this.gridColumn46.Caption = "鍒涘缓鏃堕棿 ";
+ this.gridColumn46.FieldName = "createDate";
+ this.gridColumn46.MinWidth = 50;
+ this.gridColumn46.Name = "gridColumn46";
+ this.gridColumn46.Tag = "query_a.CREATE_DATE";
+ this.gridColumn46.Visible = true;
+ this.gridColumn46.VisibleIndex = 4;
+ this.gridColumn46.Width = 94;
+ //
+ // gridColumn47
+ //
+ this.gridColumn47.Caption = "绾垮埆ID";
+ this.gridColumn47.FieldName = "lineId";
+ this.gridColumn47.MinWidth = 25;
+ this.gridColumn47.Name = "gridColumn47";
+ this.gridColumn47.Visible = true;
+ this.gridColumn47.VisibleIndex = 5;
+ this.gridColumn47.Width = 94;
+ //
+ // gridColumn48
+ //
+ this.gridColumn48.Caption = "绾垮埆鍚嶇О";
+ this.gridColumn48.FieldName = "xtName";
+ this.gridColumn48.MinWidth = 25;
+ this.gridColumn48.Name = "gridColumn48";
+ this.gridColumn48.Visible = true;
+ this.gridColumn48.VisibleIndex = 6;
+ this.gridColumn48.Width = 94;
+ //
+ // panMx100
+ //
+ this.panMx100.Controls.Add(this.ucBtnPrint100);
+ this.panMx100.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panMx100.Location = new System.Drawing.Point(0, 0);
+ this.panMx100.Name = "panMx100";
+ this.panMx100.Size = new System.Drawing.Size(1265, 54);
+ this.panMx100.TabIndex = 0;
+ //
+ // ucBtnPrint100
+ //
+ this.ucBtnPrint100.guidKey = null;
+ this.ucBtnPrint100.Location = new System.Drawing.Point(20, 9);
+ this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0);
+ this.ucBtnPrint100.Name = "ucBtnPrint100";
+ this.ucBtnPrint100.rptParameter = null;
+ this.ucBtnPrint100.Size = new System.Drawing.Size(232, 32);
+ this.ucBtnPrint100.TabIndex = 0;
//
// Frm_Womdaa
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 820);
+ this.ClientSize = new System.Drawing.Size(1269, 820);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_Womdaa";
@@ -2700,6 +2905,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa004.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -2721,6 +2927,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2733,6 +2942,7 @@
this.panMx99.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx99)).EndInit();
this.layoutMx99.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).EndInit();
@@ -2744,6 +2954,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
@@ -2761,10 +2972,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ this.xtraTabPage4.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
+ this.panMx100.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -2918,13 +3129,9 @@
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
private UserControl.UcBtnPrint ucBtnPrint1;
private DevExpress.XtraEditors.TextEdit txt_iCount_1;
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
@@ -2958,5 +3165,24 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraEditors.RadioGroup radOut;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage4;
+ private System.Windows.Forms.Panel panMx100;
+ private DevExpress.XtraGrid.GridControl gcMx4;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn40;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn41;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn44;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn45;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn46;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn47;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn48;
+ private UserControl.UcBtnPrint ucBtnPrint100;
}
}
\ 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 e2b6400..538b62a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -19,7 +19,7 @@
{
InitializeComponent();
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
- // this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ // this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
@@ -34,6 +34,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx4);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -48,7 +49,7 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //杩欐槸鎶ュ伐鐮�
+ //杩欐槸鍗℃澘鐮�
this.ucBtnPrint1.btnDesignClick += (s, e) =>
{
ucBtnPrint1.rptParameter = "rpt_daa{}";
@@ -66,9 +67,51 @@
{
_print98();
};
+ //杩欐槸鍚庣洊鐮侊紝浠呬粎鎵撳嵃锛�
+ this.ucBtnPrint100.btnDesignClick += (s, e) =>
+ {
+ ucBtnPrint100.rptParameter = "rpt_trace{}";
+ };
+ this.ucBtnPrint100.btnReportClick += (s, e) =>
+ {
+ _print100();
+ };
+ txt_psnQty_1.TextChanged += Txt_psnQty_1_TextChanged;
}
+ private void Txt_psnQty_1_TextChanged(object sender, EventArgs e)
+ {
+ string sum = txt_kQty.Text.Trim();
+ string t1 = txt_psnQty_1.Text.Trim();
+ string t2 = txt_iCount_1.Text.Trim();
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(sum))
+ sum = txt_kQty.Text = "0";
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(t1))
+ t1 = txt_psnQty_1.Text = "0";
+
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(t2))
+ t2 = txt_iCount_1.Text = "0";
+
+ if (t1 == "0")
+ {
+ t2 = txt_iCount_1.Text = "0";
+ return;
+ }
+
+ decimal? dc = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(sum);
+ decimal? dc1 = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(t1);
+
+ int dividend = int.Parse(sum); // 琚櫎鏁�
+ int divisor = int.Parse(t1); // 闄ゆ暟
+
+ int quotient = dividend / divisor; // 鏁存暟閮ㄥ垎
+ int remainder = dividend % divisor; // 浣欐暟
+
+ txt_iCount_1.Text = quotient.ToString();
+ radOut.Properties.Items[0].Description = "鍙﹀嵃" + remainder.ToString();
+
+ }
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -407,6 +450,24 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3);
}
+ JArray array4 = new JArray();
+ foreach (var a in _job["rtnData"]["list4"])
+ {
+ array4.Add(a);
+ }
+ DataTable dt4 = JsonConvert.DeserializeObject<DataTable>(array4.ToString());
+ if (dt4.Rows.Count > 0)
+ {
+ gcMx4.BindingContext = new BindingContext();
+ gcMx4.DataSource = dt4;
+ gcMx4.ForceInitialize();
+ gvMx4.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx4);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx4, gvMx4);
+ }
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -500,6 +561,13 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+
+ #region 鍚勭鎵撳嵃
+
+ /// <summary>
+ /// 杩欐槸鍗℃澘鐮�
+ /// </summary>
private void _print()
{
string rowGuid, rowName;
@@ -526,14 +594,18 @@
this.ucBtnPrint1.rptParameter = "return false";
return;
}
- this.ucBtnPrint1.rptParameter = "rpt_daa{"
+ this.ucBtnPrint1.rptParameter = "rpt_daa{"
+ txt_printRemark.Text.Trim()
- + "," +""
+ + "," + ""
+ "," + ""
+ "," + txt_iCount_1.Text.Trim()
+ "," + txt_psnQty_1.Text.Trim()
+ "}";
}
+
+ /// <summary>
+ /// 杩欐槸杩芥函鐮�
+ /// </summary>
private void _print98()
{
string rowGuid, rowName;
@@ -561,6 +633,30 @@
+ "}";
}
+ /// <summary>
+ /// 杩欐槸鍚庣洊鐮侊紝浠呬粎鎵撳嵃锛�
+ /// </summary>
+ private void _print100()
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1);
+ ucBtnPrint100.guidKey = rowGuid;
+ if (rowGuid.Length < 36)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犺鎵撳嵃鐨勮锛�");
+ this.ucBtnPrint100.rptParameter = "return false";
+ return;
+ }
+
+ this.ucBtnPrint100.rptParameter = "rpt_trace{"
+ + lbGuid.Text.Trim()
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "}";
+ }
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx2.FocusedRowHandle;
@@ -596,5 +692,7 @@
}
}
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 37f6cca..c2e9c93 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -17,7 +17,6 @@
using DevExpress.Utils;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
-using DevExpress.XtraEditors.Repository;
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Menu;
--
Gitblit v1.9.3