From 7c3e04a04c1a676b2db3d2fdb06391e05b0ab7b1 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 25 三月 2025 11:06:32 +0800
Subject: [PATCH] 生产报工
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 4
DevApp/Gs.DevApp/UserControl/showZhongTai.Designer.cs | 3
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 12
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 576 ++++++++++++++++++++++++++++++++------------------------
DevApp/Gs.DevApp/UserControl/showZhongTai.cs | 4
5 files changed, 345 insertions(+), 254 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 7d5354a..cdc375e 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -61,6 +61,7 @@
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa018 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColoun100 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa001 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -111,7 +112,7 @@
this.txt_daa028 = new DevExpress.XtraEditors.TextEdit();
this.txt_mesStartProd = new DevExpress.XtraEditors.TextEdit();
this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
- this.txt_daa022 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_daa022Txt = new DevExpress.XtraEditors.TextEdit();
this.txt_daa010 = new DevExpress.XtraEditors.TextEdit();
this.txt_mesEndProd = new DevExpress.XtraEditors.TextEdit();
this.txt_daa011 = new DevExpress.XtraEditors.TextEdit();
@@ -126,33 +127,25 @@
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -199,8 +192,21 @@
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -234,7 +240,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa028.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa022.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa022Txt.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa010.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).BeginInit();
@@ -249,33 +255,25 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -285,12 +283,21 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -370,6 +377,7 @@
this.gridColumn11,
this.gridColumn12,
this.gridColumn6,
+ this.gridColumn27,
this.gv_daa018,
this.gridColoun100,
this.gv_daa001,
@@ -519,6 +527,16 @@
this.gridColumn6.VisibleIndex = 8;
this.gridColumn6.Width = 50;
//
+ // gridColumn27
+ //
+ this.gridColumn27.Caption = "澶囨枡绾у埆";
+ this.gridColumn27.FieldName = "daa022Txt";
+ this.gridColumn27.MinWidth = 25;
+ this.gridColumn27.Name = "gridColumn27";
+ this.gridColumn27.Visible = true;
+ this.gridColumn27.VisibleIndex = 9;
+ this.gridColumn27.Width = 94;
+ //
// gv_daa018
//
this.gv_daa018.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -530,7 +548,7 @@
this.gv_daa018.OptionsColumn.AllowEdit = false;
this.gv_daa018.Tag = "query_a.daa018";
this.gv_daa018.Visible = true;
- this.gv_daa018.VisibleIndex = 9;
+ this.gv_daa018.VisibleIndex = 10;
this.gv_daa018.Width = 90;
//
// gridColoun100
@@ -541,7 +559,7 @@
this.gridColoun100.Name = "gridColoun100";
this.gridColoun100.Tag = "org.fnamber";
this.gridColoun100.Visible = true;
- this.gridColoun100.VisibleIndex = 10;
+ this.gridColoun100.VisibleIndex = 11;
this.gridColoun100.Width = 250;
//
// gv_daa001
@@ -555,7 +573,7 @@
this.gv_daa001.OptionsColumn.AllowEdit = false;
this.gv_daa001.Tag = "query_a.daa001";
this.gv_daa001.Visible = true;
- this.gv_daa001.VisibleIndex = 11;
+ this.gv_daa001.VisibleIndex = 12;
this.gv_daa001.Width = 120;
//
// gv_daa021
@@ -569,7 +587,7 @@
this.gv_daa021.OptionsColumn.AllowEdit = false;
this.gv_daa021.Tag = "query_a.daa021";
this.gv_daa021.Visible = true;
- this.gv_daa021.VisibleIndex = 12;
+ this.gv_daa021.VisibleIndex = 13;
this.gv_daa021.Width = 100;
//
// gridColumn3
@@ -579,7 +597,7 @@
this.gridColumn3.MinWidth = 50;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 13;
+ this.gridColumn3.VisibleIndex = 14;
this.gridColumn3.Width = 94;
//
// gv_daa003
@@ -593,7 +611,7 @@
this.gv_daa003.OptionsColumn.AllowEdit = false;
this.gv_daa003.Tag = "query_a.daa003";
this.gv_daa003.Visible = true;
- this.gv_daa003.VisibleIndex = 14;
+ this.gv_daa003.VisibleIndex = 15;
this.gv_daa003.Width = 150;
//
// gv_daa004
@@ -607,7 +625,7 @@
this.gv_daa004.OptionsColumn.AllowEdit = false;
this.gv_daa004.Tag = "query_a.daa004";
this.gv_daa004.Visible = true;
- this.gv_daa004.VisibleIndex = 15;
+ this.gv_daa004.VisibleIndex = 16;
this.gv_daa004.Width = 150;
//
// gv_daa008
@@ -622,7 +640,7 @@
this.gv_daa008.OptionsColumn.AllowEdit = false;
this.gv_daa008.Tag = "query_a.daa008";
this.gv_daa008.Visible = true;
- this.gv_daa008.VisibleIndex = 16;
+ this.gv_daa008.VisibleIndex = 17;
this.gv_daa008.Width = 50;
//
// gv_daa011
@@ -637,7 +655,7 @@
this.gv_daa011.OptionsColumn.AllowEdit = false;
this.gv_daa011.Tag = "query_a.daa011";
this.gv_daa011.Visible = true;
- this.gv_daa011.VisibleIndex = 17;
+ this.gv_daa011.VisibleIndex = 18;
this.gv_daa011.Width = 50;
//
// gridColumn4
@@ -647,7 +665,7 @@
this.gridColumn4.MinWidth = 50;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 18;
+ this.gridColumn4.VisibleIndex = 19;
this.gridColumn4.Width = 50;
//
// gv_daa010
@@ -662,7 +680,7 @@
this.gv_daa010.OptionsColumn.AllowEdit = false;
this.gv_daa010.Tag = "query_a.daa010";
this.gv_daa010.Visible = true;
- this.gv_daa010.VisibleIndex = 20;
+ this.gv_daa010.VisibleIndex = 21;
this.gv_daa010.Width = 50;
//
// gv_daa005
@@ -677,7 +695,7 @@
this.gv_daa005.OptionsColumn.AllowEdit = false;
this.gv_daa005.Tag = "query_a.daa005";
this.gv_daa005.Visible = true;
- this.gv_daa005.VisibleIndex = 21;
+ this.gv_daa005.VisibleIndex = 22;
this.gv_daa005.Width = 50;
//
// gv_cust
@@ -691,7 +709,7 @@
this.gv_cust.OptionsColumn.AllowEdit = false;
this.gv_cust.Tag = "query_a.cust";
this.gv_cust.Visible = true;
- this.gv_cust.VisibleIndex = 22;
+ this.gv_cust.VisibleIndex = 23;
this.gv_cust.Width = 100;
//
// gridColumn1
@@ -701,7 +719,7 @@
this.gridColumn1.MinWidth = 50;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 23;
+ this.gridColumn1.VisibleIndex = 24;
this.gridColumn1.Width = 94;
//
// gv_daa015
@@ -715,7 +733,7 @@
this.gv_daa015.OptionsColumn.AllowEdit = false;
this.gv_daa015.Tag = "query_a.daa015";
this.gv_daa015.Visible = true;
- this.gv_daa015.VisibleIndex = 24;
+ this.gv_daa015.VisibleIndex = 25;
this.gv_daa015.Width = 94;
//
// gridColumn2
@@ -725,7 +743,7 @@
this.gridColumn2.MinWidth = 50;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 25;
+ this.gridColumn2.VisibleIndex = 26;
this.gridColumn2.Width = 94;
//
// gv_daa009
@@ -739,7 +757,7 @@
this.gv_daa009.OptionsColumn.AllowEdit = false;
this.gv_daa009.Tag = "query_a.daa009";
this.gv_daa009.Visible = true;
- this.gv_daa009.VisibleIndex = 19;
+ this.gv_daa009.VisibleIndex = 20;
this.gv_daa009.Width = 94;
//
// gv_prepareTime
@@ -753,7 +771,7 @@
this.gv_prepareTime.OptionsColumn.AllowEdit = false;
this.gv_prepareTime.Tag = "query_a.prepare_time";
this.gv_prepareTime.Visible = true;
- this.gv_prepareTime.VisibleIndex = 26;
+ this.gv_prepareTime.VisibleIndex = 27;
this.gv_prepareTime.Width = 180;
//
// gv_daa028
@@ -767,7 +785,7 @@
this.gv_daa028.OptionsColumn.AllowEdit = false;
this.gv_daa028.Tag = "query_a.daa028";
this.gv_daa028.Visible = true;
- this.gv_daa028.VisibleIndex = 27;
+ this.gv_daa028.VisibleIndex = 28;
this.gv_daa028.Width = 180;
//
// gv_daa016
@@ -781,7 +799,7 @@
this.gv_daa016.OptionsColumn.AllowEdit = false;
this.gv_daa016.Tag = "query_a.daa016";
this.gv_daa016.Visible = true;
- this.gv_daa016.VisibleIndex = 28;
+ this.gv_daa016.VisibleIndex = 29;
this.gv_daa016.Width = 180;
//
// gv_daa017
@@ -795,7 +813,7 @@
this.gv_daa017.OptionsColumn.AllowEdit = false;
this.gv_daa017.Tag = "query_a.daa017";
this.gv_daa017.Visible = true;
- this.gv_daa017.VisibleIndex = 29;
+ this.gv_daa017.VisibleIndex = 30;
this.gv_daa017.Width = 180;
//
// gv_mesStartProd
@@ -809,7 +827,7 @@
this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
this.gv_mesStartProd.Visible = true;
- this.gv_mesStartProd.VisibleIndex = 30;
+ this.gv_mesStartProd.VisibleIndex = 31;
this.gv_mesStartProd.Width = 180;
//
// gv_mesEndProd
@@ -823,7 +841,7 @@
this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
this.gv_mesEndProd.Visible = true;
- this.gv_mesEndProd.VisibleIndex = 31;
+ this.gv_mesEndProd.VisibleIndex = 32;
this.gv_mesEndProd.Width = 180;
//
// gridColumn21
@@ -833,7 +851,7 @@
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 32;
+ this.gridColumn21.VisibleIndex = 33;
this.gridColumn21.Width = 94;
//
// gridColumn22
@@ -843,7 +861,7 @@
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 33;
+ this.gridColumn22.VisibleIndex = 34;
this.gridColumn22.Width = 94;
//
// gridColumn23
@@ -861,7 +879,7 @@
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 34;
+ this.gridColumn24.VisibleIndex = 35;
this.gridColumn24.Width = 94;
//
// gridColumn25
@@ -871,7 +889,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 35;
+ this.gridColumn25.VisibleIndex = 36;
this.gridColumn25.Width = 94;
//
// gridColumn26
@@ -881,7 +899,7 @@
this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 36;
+ this.gridColumn26.VisibleIndex = 37;
this.gridColumn26.Width = 94;
//
// pageBar1
@@ -920,7 +938,7 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.Size = new System.Drawing.Size(1126, 708);
- this.splitMx1.SplitterPosition = 238;
+ this.splitMx1.SplitterPosition = 237;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -942,7 +960,7 @@
this.layoutMx1.Controls.Add(this.txt_daa028);
this.layoutMx1.Controls.Add(this.txt_mesStartProd);
this.layoutMx1.Controls.Add(this.txt_daa014);
- this.layoutMx1.Controls.Add(this.txt_daa022);
+ this.layoutMx1.Controls.Add(this.txt_daa022Txt);
this.layoutMx1.Controls.Add(this.txt_daa010);
this.layoutMx1.Controls.Add(this.txt_mesEndProd);
this.layoutMx1.Controls.Add(this.txt_daa011);
@@ -959,20 +977,20 @@
this.layoutControlItem29});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(228, 363, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(910, 587, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 238);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 237);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(661, 204);
+ this.txt_kQty.Location = new System.Drawing.Point(932, 76);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(160, 28);
+ this.txt_kQty.Size = new System.Drawing.Size(161, 28);
this.txt_kQty.StyleController = this.layoutMx1;
this.txt_kQty.TabIndex = 471;
this.txt_kQty.Tag = "readonly";
@@ -1028,12 +1046,12 @@
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(661, 172);
+ this.txt_yQty.Location = new System.Drawing.Point(932, 44);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(160, 28);
+ this.txt_yQty.Size = new System.Drawing.Size(161, 28);
this.txt_yQty.StyleController = this.layoutMx1;
this.txt_yQty.TabIndex = 469;
this.txt_yQty.Tag = "readonly";
@@ -1073,7 +1091,7 @@
//
// textEdit1
//
- this.textEdit1.Location = new System.Drawing.Point(390, 12);
+ this.textEdit1.Location = new System.Drawing.Point(390, 44);
this.textEdit1.Name = "textEdit1";
this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.textEdit1.Properties.Appearance.Options.UseFont = true;
@@ -1095,11 +1113,11 @@
//
// txt_printRemark
//
- this.txt_printRemark.Location = new System.Drawing.Point(661, 140);
+ this.txt_printRemark.Location = new System.Drawing.Point(932, 108);
this.txt_printRemark.Name = "txt_printRemark";
this.txt_printRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_printRemark.Size = new System.Drawing.Size(160, 28);
+ this.txt_printRemark.Size = new System.Drawing.Size(161, 28);
this.txt_printRemark.StyleController = this.layoutMx1;
this.txt_printRemark.TabIndex = 333;
this.txt_printRemark.Tag = "readOnly-1";
@@ -1128,11 +1146,11 @@
//
// txt_mesStartProd
//
- this.txt_mesStartProd.Location = new System.Drawing.Point(932, 12);
+ this.txt_mesStartProd.Location = new System.Drawing.Point(661, 108);
this.txt_mesStartProd.Name = "txt_mesStartProd";
this.txt_mesStartProd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
- this.txt_mesStartProd.Size = new System.Drawing.Size(161, 28);
+ this.txt_mesStartProd.Size = new System.Drawing.Size(160, 28);
this.txt_mesStartProd.StyleController = this.layoutMx1;
this.txt_mesStartProd.TabIndex = 336;
this.txt_mesStartProd.Tag = "readonly";
@@ -1148,16 +1166,16 @@
this.txt_daa014.TabIndex = 327;
this.txt_daa014.Tag = "readonly";
//
- // txt_daa022
+ // txt_daa022Txt
//
- this.txt_daa022.Location = new System.Drawing.Point(390, 44);
- this.txt_daa022.Name = "txt_daa022";
- this.txt_daa022.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_daa022.Properties.Appearance.Options.UseFont = true;
- this.txt_daa022.Size = new System.Drawing.Size(160, 28);
- this.txt_daa022.StyleController = this.layoutMx1;
- this.txt_daa022.TabIndex = 462;
- this.txt_daa022.Tag = "readonly";
+ this.txt_daa022Txt.Location = new System.Drawing.Point(390, 12);
+ this.txt_daa022Txt.Name = "txt_daa022Txt";
+ this.txt_daa022Txt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_daa022Txt.Properties.Appearance.Options.UseFont = true;
+ this.txt_daa022Txt.Size = new System.Drawing.Size(160, 28);
+ this.txt_daa022Txt.StyleController = this.layoutMx1;
+ this.txt_daa022Txt.TabIndex = 462;
+ this.txt_daa022Txt.Tag = "readonly";
//
// txt_daa010
//
@@ -1172,11 +1190,11 @@
//
// txt_mesEndProd
//
- this.txt_mesEndProd.Location = new System.Drawing.Point(932, 44);
+ this.txt_mesEndProd.Location = new System.Drawing.Point(661, 140);
this.txt_mesEndProd.Name = "txt_mesEndProd";
this.txt_mesEndProd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
- this.txt_mesEndProd.Size = new System.Drawing.Size(161, 28);
+ this.txt_mesEndProd.Size = new System.Drawing.Size(160, 28);
this.txt_mesEndProd.StyleController = this.layoutMx1;
this.txt_mesEndProd.TabIndex = 338;
this.txt_mesEndProd.Tag = "readonly";
@@ -1205,11 +1223,11 @@
//
// txt_daa016
//
- this.txt_daa016.Location = new System.Drawing.Point(932, 76);
+ this.txt_daa016.Location = new System.Drawing.Point(661, 172);
this.txt_daa016.Name = "txt_daa016";
this.txt_daa016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa016.Properties.Appearance.Options.UseFont = true;
- this.txt_daa016.Size = new System.Drawing.Size(161, 28);
+ this.txt_daa016.Size = new System.Drawing.Size(160, 28);
this.txt_daa016.StyleController = this.layoutMx1;
this.txt_daa016.TabIndex = 273;
this.txt_daa016.Tag = "readonly";
@@ -1238,11 +1256,11 @@
//
// txt_daa017
//
- this.txt_daa017.Location = new System.Drawing.Point(932, 108);
+ this.txt_daa017.Location = new System.Drawing.Point(661, 204);
this.txt_daa017.Name = "txt_daa017";
this.txt_daa017.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa017.Properties.Appearance.Options.UseFont = true;
- this.txt_daa017.Size = new System.Drawing.Size(161, 28);
+ this.txt_daa017.Size = new System.Drawing.Size(160, 28);
this.txt_daa017.StyleController = this.layoutMx1;
this.txt_daa017.TabIndex = 280;
this.txt_daa017.Tag = "readonly";
@@ -1260,11 +1278,11 @@
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(661, 108);
+ this.txt_dwName.Location = new System.Drawing.Point(932, 12);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
- this.txt_dwName.Size = new System.Drawing.Size(160, 28);
+ this.txt_dwName.Size = new System.Drawing.Size(161, 28);
this.txt_dwName.StyleController = this.layoutMx1;
this.txt_dwName.TabIndex = 226;
this.txt_dwName.Tag = "readonly";
@@ -1298,33 +1316,33 @@
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
- this.layoutControlItem2,
this.layoutControlItem3,
- this.layoutControlItem4,
this.layoutControlItem5,
- this.layoutControlItem6,
this.layoutControlItem7,
- this.layoutControlItem8,
this.layoutControlItem9,
this.layoutControlItem10,
this.layoutControlItem11,
- this.layoutControlItem12,
this.layoutControlItem13,
this.layoutControlItem14,
- this.layoutControlItem15,
- this.layoutControlItem16,
this.layoutControlItem17,
this.layoutControlItem18,
this.layoutControlItem19,
this.layoutControlItem20,
- this.layoutControlItem21,
- this.layoutControlItem22,
- this.layoutControlItem23,
this.layoutControlItem24,
this.layoutControlItem25,
- this.layoutControlItem26,
this.layoutControlItem27,
- this.layoutControlItem28});
+ this.layoutControlItem28,
+ this.layoutControlItem6,
+ this.layoutControlItem2,
+ this.layoutControlItem26,
+ this.layoutControlItem15,
+ this.layoutControlItem4,
+ this.layoutControlItem22,
+ this.layoutControlItem12,
+ this.layoutControlItem23,
+ this.layoutControlItem16,
+ this.layoutControlItem21,
+ this.layoutControlItem8});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1377,16 +1395,6 @@
this.layoutControlItem1.Text = "宸ュ崟鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(95, 18);
//
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.textEdit1;
- this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem2.Text = "澶囨枡鐘舵��";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(95, 18);
- //
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_daa008;
@@ -1396,16 +1404,6 @@
this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
this.layoutControlItem3.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_mesStartProd;
- this.layoutControlItem4.Location = new System.Drawing.Point(813, 0);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem4.Text = "棰勮寮�宸ユ椂闂�";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(95, 18);
//
// layoutControlItem5
//
@@ -1417,17 +1415,6 @@
this.layoutControlItem5.Text = "鎶曟枡鍗曞彿";
this.layoutControlItem5.TextSize = new System.Drawing.Size(95, 18);
//
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_daa022;
- this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem6.Text = "閫氱煡澶囨枡";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(95, 18);
- //
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_daa010;
@@ -1438,17 +1425,6 @@
this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
this.layoutControlItem7.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_mesEndProd;
- this.layoutControlItem8.Location = new System.Drawing.Point(813, 32);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem8.Text = "棰勮瀹屽伐鏃堕棿";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(95, 18);
//
// layoutControlItem9
//
@@ -1482,17 +1458,6 @@
this.layoutControlItem11.Text = "宸茬敓浜ч噺";
this.layoutControlItem11.TextSize = new System.Drawing.Size(95, 18);
//
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_daa016;
- this.layoutControlItem12.Location = new System.Drawing.Point(813, 64);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem12.Text = "瀹為檯寮�宸ユ椂闂�";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(95, 18);
- //
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_daa029;
@@ -1513,28 +1478,6 @@
this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem14.Text = "鐢熶骇绾垮埆";
this.layoutControlItem14.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_dwName;
- this.layoutControlItem15.Location = new System.Drawing.Point(542, 96);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem15.Text = "鍗曚綅";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_daa017;
- this.layoutControlItem16.Location = new System.Drawing.Point(813, 96);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(95, 18);
//
// layoutControlItem17
//
@@ -1578,39 +1521,6 @@
this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
this.layoutControlItem20.TextSize = new System.Drawing.Size(95, 18);
//
- // layoutControlItem21
- //
- this.layoutControlItem21.Control = this.txt_printRemark;
- this.layoutControlItem21.Location = new System.Drawing.Point(542, 128);
- this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem21.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem21.Text = "鎵撳嵃澶囨敞:";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem22
- //
- this.layoutControlItem22.Control = this.txt_yQty;
- this.layoutControlItem22.Location = new System.Drawing.Point(542, 160);
- this.layoutControlItem22.Name = "layoutControlItem22";
- this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem22.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem22.Text = "宸叉墦鍗版�婚噺:";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem23
- //
- this.layoutControlItem23.Control = this.txt_kQty;
- this.layoutControlItem23.Location = new System.Drawing.Point(542, 192);
- this.layoutControlItem23.Name = "layoutControlItem23";
- this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem23.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem23.Text = "鍙墦鍗版�绘暟:";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(95, 18);
- //
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_psnQty_1;
@@ -1633,21 +1543,6 @@
this.layoutControlItem25.Text = "鎵撳嵃鏉＄爜寮犳暟:";
this.layoutControlItem25.TextSize = new System.Drawing.Size(95, 18);
//
- // layoutControlItem26
- //
- this.layoutControlItem26.Control = this.ucBtnPrint1;
- this.layoutControlItem26.Location = new System.Drawing.Point(813, 192);
- this.layoutControlItem26.MaxSize = new System.Drawing.Size(210, 0);
- this.layoutControlItem26.MinSize = new System.Drawing.Size(5, 5);
- this.layoutControlItem26.Name = "layoutControlItem26";
- this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem26.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem26.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem26.Text = "鎵撳嵃鎸夐挳";
- this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem26.TextVisible = false;
- //
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_sjXt;
@@ -1669,13 +1564,49 @@
this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(95, 18);
//
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_daa022Txt;
+ this.layoutControlItem6.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem6.Text = "閫氱煡澶囨枡";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.textEdit1;
+ this.layoutControlItem2.Location = new System.Drawing.Point(271, 32);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem2.Text = "澶囨枡鐘舵��";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem26
+ //
+ this.layoutControlItem26.Control = this.ucBtnPrint1;
+ this.layoutControlItem26.Location = new System.Drawing.Point(813, 192);
+ this.layoutControlItem26.MaxSize = new System.Drawing.Size(210, 0);
+ this.layoutControlItem26.MinSize = new System.Drawing.Size(5, 5);
+ this.layoutControlItem26.Name = "layoutControlItem26";
+ this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem26.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem26.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem26.Text = "鎵撳嵃鎸夐挳";
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem26.TextVisible = false;
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 458);
+ this.tabMx.Size = new System.Drawing.Size(1126, 459);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1685,7 +1616,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 426);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 427);
this.tabMxPage1.Text = "澶囨枡鍗曡韩";
//
// gcMx1
@@ -1694,7 +1625,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, 426);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 427);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -2060,7 +1991,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 426);
+ this.tabMxPage2.Size = new System.Drawing.Size(1124, 422);
this.tabMxPage2.Text = "鏉＄爜鏄庣粏";
//
// gcMx2
@@ -2071,7 +2002,7 @@
this.gcMx2.Name = "gcMx2";
this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMx2.Size = new System.Drawing.Size(1124, 426);
+ this.gcMx2.Size = new System.Drawing.Size(1124, 422);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2080,6 +2011,8 @@
//
this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx2.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx2.Appearance.Row.Options.UseFont = true;
this.gvMx2.ColumnPanelRowHeight = 50;
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx2guid,
@@ -2093,6 +2026,11 @@
this.gridColumn17,
this.gvMx2createBy,
this.gvMx2createDate,
+ this.gridColumn28,
+ this.gridColumn29,
+ this.gridColumn30,
+ this.gridColumn31,
+ this.gridColumn32,
this.gvBtnAlawys});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
@@ -2231,6 +2169,56 @@
this.gvMx2createDate.VisibleIndex = 9;
this.gvMx2createDate.Width = 94;
//
+ // gridColumn28
+ //
+ this.gridColumn28.Caption = "鎶ュ伐浜�";
+ this.gridColumn28.FieldName = "bgYg";
+ this.gridColumn28.MinWidth = 25;
+ this.gridColumn28.Name = "gridColumn28";
+ this.gridColumn28.Visible = true;
+ this.gridColumn28.VisibleIndex = 10;
+ this.gridColumn28.Width = 94;
+ //
+ // gridColumn29
+ //
+ this.gridColumn29.Caption = "鎶ュ伐鏃堕棿";
+ this.gridColumn29.FieldName = "bgTime";
+ this.gridColumn29.MinWidth = 25;
+ this.gridColumn29.Name = "gridColumn29";
+ this.gridColumn29.Visible = true;
+ this.gridColumn29.VisibleIndex = 11;
+ this.gridColumn29.Width = 94;
+ //
+ // gridColumn30
+ //
+ this.gridColumn30.Caption = "鍏ュ簱浜�";
+ this.gridColumn30.FieldName = "rkUser";
+ this.gridColumn30.MinWidth = 25;
+ this.gridColumn30.Name = "gridColumn30";
+ this.gridColumn30.Visible = true;
+ this.gridColumn30.VisibleIndex = 12;
+ this.gridColumn30.Width = 94;
+ //
+ // gridColumn31
+ //
+ this.gridColumn31.Caption = "鍏ュ簱鏃ユ湡";
+ this.gridColumn31.FieldName = "rkDate";
+ this.gridColumn31.MinWidth = 25;
+ this.gridColumn31.Name = "gridColumn31";
+ this.gridColumn31.Visible = true;
+ this.gridColumn31.VisibleIndex = 13;
+ this.gridColumn31.Width = 94;
+ //
+ // gridColumn32
+ //
+ this.gridColumn32.Caption = "鍏ュ簱浣�";
+ this.gridColumn32.FieldName = "rkPositon";
+ this.gridColumn32.MinWidth = 25;
+ this.gridColumn32.Name = "gridColumn32";
+ this.gridColumn32.Visible = true;
+ this.gridColumn32.VisibleIndex = 14;
+ this.gridColumn32.Width = 94;
+ //
// gvBtnAlawys
//
this.gvBtnAlawys.Caption = "绉诲嚭";
@@ -2238,7 +2226,7 @@
this.gvBtnAlawys.MinWidth = 25;
this.gvBtnAlawys.Name = "gvBtnAlawys";
this.gvBtnAlawys.Visible = true;
- this.gvBtnAlawys.VisibleIndex = 10;
+ this.gvBtnAlawys.VisibleIndex = 15;
this.gvBtnAlawys.Width = 94;
//
// repositoryItemButtonEdit1
@@ -2250,6 +2238,94 @@
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);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_dwName;
+ this.layoutControlItem15.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem15.Text = "鍗曚綅";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_mesStartProd;
+ this.layoutControlItem4.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem4.Text = "棰勮寮�宸ユ椂闂�";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem22
+ //
+ this.layoutControlItem22.Control = this.txt_yQty;
+ this.layoutControlItem22.Location = new System.Drawing.Point(813, 32);
+ this.layoutControlItem22.Name = "layoutControlItem22";
+ this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem22.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem22.Text = "宸叉墦鍗版�婚噺:";
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_daa016;
+ this.layoutControlItem12.Location = new System.Drawing.Point(542, 160);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem12.Text = "瀹為檯寮�宸ユ椂闂�";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.txt_kQty;
+ this.layoutControlItem23.Location = new System.Drawing.Point(813, 64);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem23.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem23.Text = "鍙墦鍗版�绘暟:";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_daa017;
+ this.layoutControlItem16.Location = new System.Drawing.Point(542, 192);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.Control = this.txt_printRemark;
+ this.layoutControlItem21.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem21.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem21.Text = "鎵撳嵃澶囨敞:";
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_mesEndProd;
+ this.layoutControlItem8.Location = new System.Drawing.Point(542, 128);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem8.Text = "棰勮瀹屽伐鏃堕棿";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(95, 18);
//
// Frm_Womdaa
//
@@ -2293,7 +2369,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa028.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa022.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa022Txt.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa010.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).EndInit();
@@ -2308,33 +2384,25 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2344,6 +2412,14 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
this.ResumeLayout(false);
}
@@ -2401,7 +2477,7 @@
private DevExpress.XtraEditors.TextEdit textEdit1;
private DevExpress.XtraEditors.TextEdit txt_saleOrderNo;
private UserControl.UcBtnPrint ucBtnPrint1;
- private DevExpress.XtraEditors.TextEdit txt_daa022;
+ private DevExpress.XtraEditors.TextEdit txt_daa022Txt;
private DevExpress.XtraEditors.TextEdit txt_daa028;
private DevExpress.XtraEditors.TextEdit txt_mesEndProd;
private DevExpress.XtraEditors.TextEdit txt_mesStartProd;
@@ -2427,31 +2503,20 @@
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
@@ -2503,5 +2568,22 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx2createDate;
private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
}
}
\ 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 d70696a..c27c5ae 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -116,7 +116,7 @@
private void ToolBarMenu1_btnJieAnClick1(object sender, EventArgs e)
{
-
+ _toolCk(99);
}
private void ToolBarMenu1_btnTzblClick(object sender, EventArgs e)
{
@@ -249,6 +249,8 @@
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
toolBarMenu1.currentAction = "";
+ txt_printRemark.Enabled = txt_psnQty_1.Enabled = txt_iCount_1.Enabled = true;
+ txt_printRemark.ReadOnly = txt_psnQty_1.ReadOnly = txt_iCount_1.ReadOnly = false;
}
}
catch (Exception ex)
@@ -415,6 +417,9 @@
case 9:
strMsg = "鎵嬪姩瀹屽伐";
break;
+ case 99:
+ strMsg = "缁撴";
+ break;
};
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -506,12 +511,12 @@
var _obj = new
{
mxGuid = mxGuid,
- inType = "dhtm"
+ inType = "daa"
};
try
{
var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "DeleteBarcode",
+ "VArrivalBarcodeManager/DeleteBarcode",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
@@ -526,5 +531,6 @@
}
}
}
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 6b9311a..60d2168 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -486,7 +486,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 63);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 69);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -515,7 +515,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 63);
+ this.Size = new System.Drawing.Size(1543, 69);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/DevApp/Gs.DevApp/UserControl/showZhongTai.Designer.cs b/DevApp/Gs.DevApp/UserControl/showZhongTai.Designer.cs
index 45f34f3..4dfaed2 100644
--- a/DevApp/Gs.DevApp/UserControl/showZhongTai.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/showZhongTai.Designer.cs
@@ -46,17 +46,20 @@
//
// comZt
//
+ this.comZt.EditValue = "-璇烽�夋嫨-";
this.comZt.Location = new System.Drawing.Point(158, 56);
this.comZt.Name = "comZt";
this.comZt.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.comZt.Properties.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
"1,寰呭紑宸�",
"2,宸ュ崟鏆傚仠",
"3,鎾ゅ洖瀹屽伐",
"4,绱ф�ュ鏂�",
"5,鏆傚仠澶囨枡",
"6,鎾ゅ洖澶囨枡"});
+ this.comZt.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.comZt.Size = new System.Drawing.Size(125, 24);
this.comZt.TabIndex = 2;
//
diff --git a/DevApp/Gs.DevApp/UserControl/showZhongTai.cs b/DevApp/Gs.DevApp/UserControl/showZhongTai.cs
index ad49ad5..6200ca6 100644
--- a/DevApp/Gs.DevApp/UserControl/showZhongTai.cs
+++ b/DevApp/Gs.DevApp/UserControl/showZhongTai.cs
@@ -19,12 +19,12 @@
InitializeComponent();
btnSave.Click += (s, e) =>
{
- string str = comZt.SelectedText.Trim();
- if (str.Length == 0)
+ if (comZt.SelectedIndex<= 0)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鐘舵�侊紒");
return;
}
+ string str = comZt.Text.Trim();
UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = str });
Close();
};
--
Gitblit v1.9.3