From 9e861a3ab67506b8498a79575b97ffd6390c3d61 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 03 四月 2025 17:08:45 +0800
Subject: [PATCH] loading
---
DevApp/Gs.DevApp/VanishingMessage.Designer.cs | 71 ++++
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs | 6
DevApp/Gs.DevApp/XtraForm1.Designer.cs | 144 -------
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | 105 +++---
DevApp/Gs.DevApp/VanishingMessage.cs | 76 ++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 10
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs | 16
DevApp/Gs.DevApp/XtraForm1.resx | 3
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 15
/dev/null | 53 ---
DevApp/Gs.DevApp/VanishingMessage.resx | 120 +++++++
DevApp/Gs.DevApp/Program.cs | 4
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 288 ++++++++--------
DevApp/Gs.DevApp/XtraForm1.cs | 69 ---
14 files changed, 521 insertions(+), 459 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesDefectType.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesDefectType.cs
deleted file mode 100644
index 772e1d7..0000000
--- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesDefectType.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace MES.Service.Modes
-{
- /// <summary>
- /// 缂洪櫡绫诲埆琛�
- ///</summary>
- public class MesDefectType
- {
- /// <summary>
- /// guid
- /// 榛樿鍊�: (newid())
- ///</summary>
- public Guid Guid { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- ///</summary>
- public string CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- ///</summary>
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 鏇存柊浜�
- ///</summary>
- public string LastupdateBy { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃堕棿
- ///</summary>
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// 缂洪櫡绫诲埆缂栧彿
- ///</summary>
- public string TypeNo { get; set; }
-
- /// <summary>
- /// 缂洪櫡绫诲埆鎻忚堪
- ///</summary>
- public string TypeMemo { get; set; }
-
- public string TypeCategory { get; set; }
-
- public Guid UpGuid { get; set; }
-
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 221b5a2..365f764 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -29,39 +29,39 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -230,12 +230,13 @@
this.gcMx3 = new DevExpress.XtraGrid.GridControl();
this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.panMx98 = new System.Windows.Forms.Panel();
this.layoutMx98 = new DevExpress.XtraLayout.LayoutControl();
@@ -250,7 +251,6 @@
this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
- this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -1290,38 +1290,38 @@
this.layoutControlItem27});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition16.Width = 100D;
- columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition17.Width = 100D;
- columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition18.Width = 100D;
- columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition19.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition16,
- columnDefinition17,
- columnDefinition18,
- columnDefinition19});
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition10.Height = 100D;
- rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition11.Height = 100D;
- rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition12.Height = 100D;
- rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition9,
- rowDefinition10,
- rowDefinition11,
- rowDefinition12,
- rowDefinition13,
- rowDefinition14});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
this.Root.Size = new System.Drawing.Size(1105, 188);
this.Root.TextVisible = false;
//
@@ -2160,10 +2160,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -2270,29 +2270,29 @@
this.layoutControlItem26});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition20.Width = 100D;
- columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition21.Width = 100D;
- columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition22.Width = 100D;
- columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition23.Width = 100D;
- columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition24.Width = 100D;
- columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition25.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition20,
- columnDefinition21,
- columnDefinition22,
- columnDefinition23,
- columnDefinition24,
- columnDefinition25});
- rowDefinition15.Height = 100D;
- rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8,
+ columnDefinition9,
+ columnDefinition10});
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition15});
+ rowDefinition7});
this.layoutControlGroup1.Size = new System.Drawing.Size(1124, 54);
this.layoutControlGroup1.TextVisible = false;
//
@@ -2386,12 +2386,12 @@
this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn33,
this.gridColumn38,
- this.gridColumn34,
this.gridColumn36,
this.gridColumn37,
this.gridColumn42,
this.gridColumn43,
- this.gridColumn49});
+ this.gridColumn34,
+ this.gridColumn35});
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -2407,6 +2407,28 @@
this.gridColumn33.Name = "gridColumn33";
this.gridColumn33.Tag = "query_a.guid";
this.gridColumn33.Width = 94;
+ //
+ // gridColumn38
+ //
+ this.gridColumn38.AppearanceCell.Options.UseFont = true;
+ this.gridColumn38.Caption = "宸ュ崟鍙�";
+ this.gridColumn38.FieldName = "daa001";
+ this.gridColumn38.MinWidth = 50;
+ this.gridColumn38.Name = "gridColumn38";
+ this.gridColumn38.Tag = "query_a.UNIT";
+ this.gridColumn38.Visible = true;
+ this.gridColumn38.VisibleIndex = 0;
+ this.gridColumn38.Width = 94;
+ //
+ // gridColumn34
+ //
+ this.gridColumn34.Caption = "绾垮埆ID";
+ this.gridColumn34.FieldName = "lineId";
+ this.gridColumn34.MinWidth = 25;
+ this.gridColumn34.Name = "gridColumn34";
+ this.gridColumn34.Visible = true;
+ this.gridColumn34.VisibleIndex = 5;
+ this.gridColumn34.Width = 94;
//
// gridColumn36
//
@@ -2432,18 +2454,6 @@
this.gridColumn37.VisibleIndex = 2;
this.gridColumn37.Width = 94;
//
- // gridColumn38
- //
- this.gridColumn38.AppearanceCell.Options.UseFont = true;
- this.gridColumn38.Caption = "宸ュ崟鍙�";
- this.gridColumn38.FieldName = "daa001";
- this.gridColumn38.MinWidth = 50;
- this.gridColumn38.Name = "gridColumn38";
- this.gridColumn38.Tag = "query_a.UNIT";
- this.gridColumn38.Visible = true;
- this.gridColumn38.VisibleIndex = 0;
- this.gridColumn38.Width = 94;
- //
// gridColumn42
//
this.gridColumn42.AppearanceCell.Options.UseFont = true;
@@ -2468,23 +2478,23 @@
this.gridColumn43.VisibleIndex = 4;
this.gridColumn43.Width = 94;
//
- // gridColumn49
+ // gridColumn35
//
- this.gridColumn49.Caption = "绉诲嚭";
- this.gridColumn49.ColumnEdit = this.repositoryItemButtonEdit2;
- this.gridColumn49.MinWidth = 25;
- this.gridColumn49.Name = "gridColumn49";
- this.gridColumn49.Visible = true;
- this.gridColumn49.VisibleIndex = 6;
- this.gridColumn49.Width = 94;
+ this.gridColumn35.Caption = "绾垮埆鍚嶇О";
+ this.gridColumn35.FieldName = "xtName";
+ this.gridColumn35.MinWidth = 25;
+ this.gridColumn35.Name = "gridColumn35";
+ this.gridColumn35.Visible = true;
+ this.gridColumn35.VisibleIndex = 6;
+ this.gridColumn35.Width = 94;
//
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
@@ -2568,26 +2578,26 @@
this.layoutControlItem34});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "layoutControlGroup2";
- columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition26.Width = 100D;
- columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition27.Width = 100D;
- columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition28.Width = 100D;
- columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition29.Width = 100D;
- columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition30.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
+ columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition13.Width = 100D;
+ columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition14.Width = 100D;
+ columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition26,
- columnDefinition27,
- columnDefinition28,
- columnDefinition29,
- columnDefinition30});
- rowDefinition16.Height = 100D;
- rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11,
+ columnDefinition12,
+ columnDefinition13,
+ columnDefinition14,
+ columnDefinition15});
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition16});
+ rowDefinition8});
this.layoutControlGroup2.Size = new System.Drawing.Size(1124, 48);
this.layoutControlGroup2.TextVisible = false;
//
@@ -2639,16 +2649,6 @@
this.layoutControlItem34.Size = new System.Drawing.Size(221, 28);
this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem34.TextVisible = false;
- //
- // gridColumn34
- //
- this.gridColumn34.Caption = "绾垮埆";
- this.gridColumn34.FieldName = "lineId";
- this.gridColumn34.MinWidth = 25;
- this.gridColumn34.Name = "gridColumn34";
- this.gridColumn34.Visible = true;
- this.gridColumn34.VisibleIndex = 1;
- this.gridColumn34.Width = 94;
//
// Frm_Womdaa
//
@@ -2941,7 +2941,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn43;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn49;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
private System.Windows.Forms.Panel panMx98;
private DevExpress.XtraLayout.LayoutControl layoutMx98;
@@ -2957,5 +2956,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
index eac1379..a10442b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -29,16 +29,16 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -82,7 +82,7 @@
this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton4 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton3 = new DevExpress.XtraEditors.SimpleButton();
- this.progressBarControl1 = new DevExpress.XtraEditors.ProgressBarControl();
+ this.prog1 = new DevExpress.XtraEditors.ProgressBarControl();
this.panel3 = new System.Windows.Forms.Panel();
this.lbSum4 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
@@ -113,7 +113,6 @@
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -129,6 +128,7 @@
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
this.splitMx1.Panel1.SuspendLayout();
@@ -176,7 +176,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.progressBarControl1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
this.panel3.SuspendLayout();
this.panel2.SuspendLayout();
this.panel4.SuspendLayout();
@@ -231,7 +231,7 @@
this.splitTop1.Panel2.Controls.Add(this.simpleButton5);
this.splitTop1.Panel2.Controls.Add(this.simpleButton4);
this.splitTop1.Panel2.Controls.Add(this.simpleButton3);
- this.splitTop1.Panel2.Controls.Add(this.progressBarControl1);
+ this.splitTop1.Panel2.Controls.Add(this.prog1);
this.splitTop1.Panel2.Controls.Add(this.panel3);
this.splitTop1.Panel2.Controls.Add(this.panel2);
this.splitTop1.Panel2.Controls.Add(this.panel4);
@@ -303,7 +303,7 @@
this.txt_barCode.Name = "txt_barCode";
this.txt_barCode.Size = new System.Drawing.Size(328, 24);
this.txt_barCode.StyleController = this.layoutMx1;
- this.txt_barCode.TabIndex = 7;
+ this.txt_barCode.TabIndex = 1;
//
// txt_currentBarCode
//
@@ -449,38 +449,38 @@
this.layoutControlItem11});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
+ rowDefinition7,
+ rowDefinition8,
+ rowDefinition9,
+ rowDefinition10,
+ rowDefinition11,
+ rowDefinition12});
this.Root.Size = new System.Drawing.Size(828, 191);
this.Root.TextVisible = false;
//
@@ -724,12 +724,13 @@
this.simpleButton3.TabIndex = 6;
this.simpleButton3.Text = "鐗╂枡";
//
- // progressBarControl1
+ // prog1
//
- this.progressBarControl1.Location = new System.Drawing.Point(21, 88);
- this.progressBarControl1.Name = "progressBarControl1";
- this.progressBarControl1.Size = new System.Drawing.Size(489, 22);
- this.progressBarControl1.TabIndex = 5;
+ this.prog1.Location = new System.Drawing.Point(21, 88);
+ this.prog1.Name = "prog1";
+ this.prog1.Properties.ShowTitle = true;
+ this.prog1.Size = new System.Drawing.Size(489, 22);
+ this.prog1.TabIndex = 5;
//
// panel3
//
@@ -1272,7 +1273,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.progressBarControl1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
this.panel3.ResumeLayout(false);
this.panel3.PerformLayout();
this.panel2.ResumeLayout(false);
@@ -1358,7 +1359,7 @@
private DevExpress.XtraEditors.SimpleButton simpleButton5;
private DevExpress.XtraEditors.SimpleButton simpleButton4;
private DevExpress.XtraEditors.SimpleButton simpleButton3;
- private DevExpress.XtraEditors.ProgressBarControl progressBarControl1;
+ private DevExpress.XtraEditors.ProgressBarControl prog1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 3676326..0451b93 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -1,13 +1,10 @@
-锘縰sing DevExpress.XtraBars.Alerter;
-using DevExpress.XtraBars.ToastNotifications;
-using DevExpress.XtraEditors;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Data;
-using System.Drawing;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.Work
@@ -20,15 +17,14 @@
public Frm_Work01(string _fGx, string _fBc)
{
InitializeComponent();
- this.Text = "宸ュ簭閲囬泦 - " + _fGx;
+ this.Text = "宸ュ簭閲囬泦 - " + _fGx+ " - "+ fBc;
this.fGx = _fGx;
this.fBc = _fBc;
txt_gx.Text = fGx;
txt_bc.Text = fBc;
- txt_barCode.Focus();
txt_barCode.KeyDown += (s, e) =>
{
- if (e.KeyCode == Keys.Enter) { getModel("", ""); };
+ if (e.KeyCode == Keys.Enter) { getModel("", "鈭�"); };
};
btnGood.Click += (s, e) =>
{
@@ -71,6 +67,11 @@
{
dynamic dy = _rtn.rtnData;
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, false);
+ lbSum1.Text = dy.lbSum1;
+ lbSum2.Text = dy.lbSum2;
+ lbSum3.Text = dy.lbSum3;
+ lbSum4.Text = dy.lbSum4;
+ prog1.Position = dy.jd;
txt_barCode.ReadOnly = false;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 54f208c..ee6d6a5 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -423,7 +423,6 @@
<DependentUpon>MesQcExceptional.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\QC\Models\MesDefectCode.cs" />
- <Compile Include="DevFrm\QC\Models\MesDefectType.cs" />
<Compile Include="DevFrm\QC\Models\MesQaMj.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql1.cs" />
<Compile Include="DevFrm\QC\Models\MesQmAql2.cs" />
@@ -1136,6 +1135,12 @@
<Compile Include="UserControl\UCUpFile.Designer.cs">
<DependentUpon>UCUpFile.cs</DependentUpon>
</Compile>
+ <Compile Include="VanishingMessage.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="VanishingMessage.Designer.cs">
+ <DependentUpon>VanishingMessage.cs</DependentUpon>
+ </Compile>
<Compile Include="XtraForm1.cs">
<SubType>Form</SubType>
</Compile>
@@ -1600,6 +1605,9 @@
<EmbeddedResource Include="UserControl\UCUpFile.resx">
<DependentUpon>UCUpFile.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="VanishingMessage.resx">
+ <DependentUpon>VanishingMessage.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="XtraForm1.resx">
<DependentUpon>XtraForm1.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 3459e3d..b199abe 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -39,8 +39,8 @@
/// </summary>
private static void _startLogin()
{
- //Application.Run(new XtraForm1());
- //return;
+ Application.Run(new XtraForm1());
+ return;
CefSettings settings = new CefSettings();
settings.Locale = "zh-CN";
Cef.Initialize(settings);
diff --git a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
index 7019c36..bc26169 100644
--- a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
@@ -50,7 +50,7 @@
this.tlMenu.MinWidth = 23;
this.tlMenu.Name = "tlMenu";
this.tlMenu.OptionsView.CheckBoxStyle = DevExpress.XtraTreeList.DefaultNodeCheckBoxStyle.Check;
- this.tlMenu.OptionsView.RootCheckBoxStyle = DevExpress.XtraTreeList.NodeCheckBoxStyle.None;
+ this.tlMenu.OptionsView.RootCheckBoxStyle = DevExpress.XtraTreeList.NodeCheckBoxStyle.Check;
this.tlMenu.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Solid;
this.tlMenu.Size = new System.Drawing.Size(445, 464);
this.tlMenu.TabIndex = 5;
@@ -97,7 +97,7 @@
this.btnIn.TabIndex = 5;
this.btnIn.Text = "纭畾閫夋嫨";
//
- // SelectDictionary
+ // UcDictionarySelect
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -107,7 +107,7 @@
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
this.MinimizeBox = false;
- this.Name = "SelectDictionary";
+ this.Name = "UcDictionarySelect";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "璇烽�夋嫨";
((System.ComponentModel.ISupportInitialize)(this.tlMenu)).EndInit();
diff --git a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
index e0aefaa..9b53c8c 100644
--- a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
@@ -37,12 +37,11 @@
{
list.Add(new
{
- // dicCode = "001",
+ // dicCode = "001",
dicTxt = key
});
};
- UpdateParent?.Invoke(this,
- new UpdateParentEventArgs { DynamicList = list });
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
Close();
};
tlMenu.IndicatorWidth = 50;
@@ -120,6 +119,15 @@
{
if (parentNode.Nodes.Count == 0)
{
+ if (parentNode.CheckState == CheckState.Checked)
+ {
+ DataRowView drv = tlMenu.GetDataRecordByNode(parentNode) as DataRowView;//鍏抽敭浠ｇ爜锛屽氨鏄笉鐭ラ亾鏄繖鏍疯幏鍙栨暟鎹�岀籂缁撲簡寰堜箙(楝肩煡閬撳彲浠ヨ浆鎹负DataRowView鍟�)
+ if (drv != null)
+ {
+ string KeyFieldName = (string)drv["defectName"];
+ lstCheckedKeyID.Add(KeyFieldName);
+ }
+ }
return;//閫掑綊缁堟
}
foreach (TreeListNode node in parentNode.Nodes)
@@ -143,7 +151,6 @@
private void findOrigin(DevExpress.XtraTreeList.TreeList tree)
{
this.lstCheckedKeyID.Clear();
-
if (tree.Nodes.Count > 0)
{
foreach (TreeListNode root in tree.Nodes)
@@ -152,7 +159,6 @@
}
}
}
-
#endregion
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/VanishingMessage.Designer.cs b/DevApp/Gs.DevApp/VanishingMessage.Designer.cs
new file mode 100644
index 0000000..b3e35ed
--- /dev/null
+++ b/DevApp/Gs.DevApp/VanishingMessage.Designer.cs
@@ -0,0 +1,71 @@
+锘縩amespace Gs.DevApp
+{
+ partial class VanishingMessage
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.testo = new DevExpress.XtraEditors.LabelControl();
+ this.SuspendLayout();
+ //
+ // testo
+ //
+ this.testo.Appearance.Font = new System.Drawing.Font("Tahoma", 22F);
+ this.testo.Appearance.ForeColor = System.Drawing.Color.White;
+ this.testo.Appearance.Options.UseFont = true;
+ this.testo.Appearance.Options.UseForeColor = true;
+ this.testo.Location = new System.Drawing.Point(192, 121);
+ this.testo.Name = "testo";
+ this.testo.Size = new System.Drawing.Size(210, 45);
+ this.testo.TabIndex = 7;
+ this.testo.Text = "labelControl1";
+ //
+ // VanishingMessage
+ //
+ this.Appearance.BackColor = System.Drawing.Color.DodgerBlue;
+ this.Appearance.Options.UseBackColor = true;
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(618, 336);
+ this.ControlBox = false;
+ this.Controls.Add(this.testo);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "VanishingMessage";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "VanishingMessage";
+ this.TopMost = true;
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraEditors.LabelControl testo;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/VanishingMessage.cs b/DevApp/Gs.DevApp/VanishingMessage.cs
new file mode 100644
index 0000000..5f22b0e
--- /dev/null
+++ b/DevApp/Gs.DevApp/VanishingMessage.cs
@@ -0,0 +1,76 @@
+锘縰sing DevExpress.XtraEditors;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp
+{
+ public partial class VanishingMessage : DevExpress.XtraEditors.XtraForm
+ {
+ private System.Windows.Forms.Timer tmr;
+ private System.Windows.Forms.Timer tmr2;
+ /// <summary>
+ /// Shows a message windows. 3 sec is the suggested time
+ /// </summary>
+ /// <param name="messageText">Message</param>
+ /// <param name="vanishingSeconds">Showing time</param>
+ public VanishingMessage(System.Drawing.Color bgColor,string messageText, int vanishingSeconds = 3)
+ {
+ InitializeComponent();
+ this.Appearance.BackColor = bgColor;
+ double elapsedTime = 0;
+ testo.Text = messageText;
+ double vanishingMilliSeconds = vanishingSeconds * 1000;
+
+ // message dimensions
+ //this.Width = testo.Width + 50;
+ //this.Height = testo.Height + 50;
+
+ //text position
+ // testo.Location = new Point((this.Width / 2) - (testo.Width / 2), (this.Height / 2) - (testo.Height / 2));
+
+ //first timer
+ tmr = new System.Windows.Forms.Timer();
+ tmr.Tick += delegate
+ {
+ tmr.Stop();
+ tmr2.Stop();
+ tmr.Dispose();
+ tmr2.Dispose();
+ this.Close();
+ };
+ tmr.Interval = (int)TimeSpan.FromSeconds(vanishingSeconds).TotalMilliseconds;
+ tmr.Start();
+
+ //second timer
+ tmr2 = new System.Windows.Forms.Timer();
+ tmr2.Tick += delegate
+ {
+ elapsedTime += 50;
+
+ if (elapsedTime >= (vanishingMilliSeconds * 65) / 100)
+ this.Opacity -= 0.05f;
+
+ };
+ tmr2.Interval = (int)TimeSpan.FromMilliseconds(50).TotalMilliseconds;
+ tmr2.Start();
+ }
+
+ private void VanishingMessage_Paint(object sender, PaintEventArgs e)
+ {
+ Graphics g = this.CreateGraphics();
+ Pen p = new Pen(Color.DarkRed);
+ SolidBrush sb = new SolidBrush(Color.DarkRed);
+ Rectangle r = this.DisplayRectangle;
+ r.Width -= 1;
+ r.Height -= 1;
+ g.DrawRectangle(p, r);
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/VanishingMessage.resx b/DevApp/Gs.DevApp/VanishingMessage.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/VanishingMessage.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/XtraForm1.Designer.cs
index 250ac14..dff26f3 100644
--- a/DevApp/Gs.DevApp/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/XtraForm1.Designer.cs
@@ -28,125 +28,9 @@
/// </summary>
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
- this.tlMenu = new DevExpress.XtraTreeList.TreeList();
- this.tlcModuleID = new DevExpress.XtraTreeList.Columns.TreeListColumn();
- this.tlcMenuCaption = new DevExpress.XtraTreeList.Columns.TreeListColumn();
- this.tlcMenuName = new DevExpress.XtraTreeList.Columns.TreeListColumn();
- this.tlcActions = new DevExpress.XtraTreeList.Columns.TreeListColumn();
- this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
- this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
- this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem();
this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
- ((System.ComponentModel.ISupportInitialize)(this.tlMenu)).BeginInit();
- this.contextMenuStrip1.SuspendLayout();
+ this.testo = new DevExpress.XtraEditors.LabelControl();
this.SuspendLayout();
- //
- // tlMenu
- //
- this.tlMenu.Appearance.Row.Options.UseFont = true;
- this.tlMenu.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] {
- this.tlcModuleID,
- this.tlcMenuCaption,
- this.tlcMenuName,
- this.tlcActions});
- this.tlMenu.Cursor = System.Windows.Forms.Cursors.Default;
- this.tlMenu.Location = new System.Drawing.Point(0, 386);
- this.tlMenu.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.tlMenu.MinWidth = 23;
- this.tlMenu.Name = "tlMenu";
- this.tlMenu.OptionsMenu.EnableColumnMenu = false;
- this.tlMenu.OptionsMenu.EnableFooterMenu = false;
- this.tlMenu.OptionsMenu.EnableNodeMenu = false;
- this.tlMenu.OptionsMenu.ShowAddNodeItems = DevExpress.Utils.DefaultBoolean.False;
- this.tlMenu.OptionsMenu.ShowAutoFilterRowItem = false;
- this.tlMenu.OptionsMenu.ShowExpandCollapseItems = false;
- this.tlMenu.OptionsView.CheckBoxStyle = DevExpress.XtraTreeList.DefaultNodeCheckBoxStyle.Check;
- this.tlMenu.OptionsView.RootCheckBoxStyle = DevExpress.XtraTreeList.NodeCheckBoxStyle.None;
- this.tlMenu.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Solid;
- this.tlMenu.Size = new System.Drawing.Size(887, 273);
- this.tlMenu.TabIndex = 4;
- this.tlMenu.TreeLevelWidth = 21;
- this.tlMenu.MouseDown += new System.Windows.Forms.MouseEventHandler(this.tlMenu_MouseDown);
- //
- // tlcModuleID
- //
- this.tlcModuleID.Caption = "guid";
- this.tlcModuleID.FieldName = "guid";
- this.tlcModuleID.MinWidth = 23;
- this.tlcModuleID.Name = "tlcModuleID";
- this.tlcModuleID.Visible = true;
- this.tlcModuleID.VisibleIndex = 0;
- this.tlcModuleID.Width = 103;
- //
- // tlcMenuCaption
- //
- this.tlcMenuCaption.Caption = "缂栧彿";
- this.tlcMenuCaption.FieldName = "typeNo";
- this.tlcMenuCaption.MinWidth = 23;
- this.tlcMenuCaption.Name = "tlcMenuCaption";
- this.tlcMenuCaption.Visible = true;
- this.tlcMenuCaption.VisibleIndex = 1;
- this.tlcMenuCaption.Width = 139;
- //
- // tlcMenuName
- //
- this.tlcMenuName.Caption = "鎻忚堪";
- this.tlcMenuName.FieldName = "typeMemo";
- this.tlcMenuName.MinWidth = 38;
- this.tlcMenuName.Name = "tlcMenuName";
- this.tlcMenuName.Visible = true;
- this.tlcMenuName.VisibleIndex = 2;
- this.tlcMenuName.Width = 215;
- //
- // tlcActions
- //
- this.tlcActions.Caption = "绫诲瀷";
- this.tlcActions.FieldName = "typeCategory";
- this.tlcActions.MinWidth = 23;
- this.tlcActions.Name = "tlcActions";
- this.tlcActions.Visible = true;
- this.tlcActions.VisibleIndex = 3;
- this.tlcActions.Width = 50;
- //
- // contextMenuStrip1
- //
- this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
- this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripMenuItem1,
- this.toolStripMenuItem2,
- this.toolStripMenuItem3,
- this.toolStripMenuItem4});
- this.contextMenuStrip1.Name = "contextMenuStrip1";
- this.contextMenuStrip1.Size = new System.Drawing.Size(228, 100);
- //
- // toolStripMenuItem1
- //
- this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(227, 24);
- this.toolStripMenuItem1.Text = "toolStripMenuItem1";
- this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
- //
- // toolStripMenuItem2
- //
- this.toolStripMenuItem2.Name = "toolStripMenuItem2";
- this.toolStripMenuItem2.Size = new System.Drawing.Size(227, 24);
- this.toolStripMenuItem2.Text = "toolStripMenuItem2";
- this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
- //
- // toolStripMenuItem3
- //
- this.toolStripMenuItem3.Name = "toolStripMenuItem3";
- this.toolStripMenuItem3.Size = new System.Drawing.Size(227, 24);
- this.toolStripMenuItem3.Text = "toolStripMenuItem3";
- //
- // toolStripMenuItem4
- //
- this.toolStripMenuItem4.Name = "toolStripMenuItem4";
- this.toolStripMenuItem4.Size = new System.Drawing.Size(227, 24);
- this.toolStripMenuItem4.Text = "toolStripMenuItem4";
//
// simpleButton1
//
@@ -156,34 +40,32 @@
this.simpleButton1.Size = new System.Drawing.Size(94, 29);
this.simpleButton1.TabIndex = 5;
this.simpleButton1.Text = "simpleButton1";
+ this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
+ //
+ // testo
+ //
+ this.testo.Location = new System.Drawing.Point(168, 293);
+ this.testo.Name = "testo";
+ this.testo.Size = new System.Drawing.Size(81, 18);
+ this.testo.TabIndex = 6;
+ this.testo.Text = "labelControl1";
//
// XtraForm1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(887, 659);
+ this.Controls.Add(this.testo);
this.Controls.Add(this.simpleButton1);
- this.Controls.Add(this.tlMenu);
this.Name = "XtraForm1";
this.Text = "XtraForm1";
- ((System.ComponentModel.ISupportInitialize)(this.tlMenu)).EndInit();
- this.contextMenuStrip1.ResumeLayout(false);
this.ResumeLayout(false);
+ this.PerformLayout();
}
#endregion
-
- private DevExpress.XtraTreeList.TreeList tlMenu;
- private DevExpress.XtraTreeList.Columns.TreeListColumn tlcModuleID;
- private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuName;
- private DevExpress.XtraTreeList.Columns.TreeListColumn tlcMenuCaption;
- private DevExpress.XtraTreeList.Columns.TreeListColumn tlcActions;
- private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
- private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1;
- private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
- private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
- private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem4;
private DevExpress.XtraEditors.SimpleButton simpleButton1;
+ private DevExpress.XtraEditors.LabelControl testo;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/XtraForm1.cs b/DevApp/Gs.DevApp/XtraForm1.cs
index 49e5a3e..820046c 100644
--- a/DevApp/Gs.DevApp/XtraForm1.cs
+++ b/DevApp/Gs.DevApp/XtraForm1.cs
@@ -1,4 +1,6 @@
-锘縰sing DevExpress.XtraEditors;
+锘縰sing DevExpress.Internal.WinApi;
+using DevExpress.XtraBars.ToastNotifications;
+using DevExpress.XtraEditors;
using DevExpress.XtraTreeList;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -20,67 +22,18 @@
public XtraForm1()
{
InitializeComponent();
- tlMenu.ContextMenuStrip = contextMenuStrip1;
- getTree();
+
}
- /// <summary>
- /// 璇诲彇鍒楄〃
- /// </summary>
- private void getTree()
+ private void simpleButton1_Click(object sender, EventArgs e)
{
- var pgq = new PageQueryModel(1, 999999, "a.type_memo");
- var json = JsonConvert.SerializeObject(pgq);
- try
- {
- var strReturn =
- UtilityHelper.HttpPost("", "MesDefectTypeManager/GetListPage", json);
- var dd = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = dd.rtnData.list;
- tlMenu.DataSource = dt;
- tlMenu.KeyFieldName = "guid";
- tlMenu.ParentFieldName = "upGuid";
- tlMenu.Tag = "typeMemo";
- tlMenu.EndUpdate();
- this.tlMenu.CollapseAll();
- tlMenu.OptionsBehavior.Editable = true;
- tlMenu.OptionsBehavior.AllowRecursiveNodeChecking = false;
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
+ //toastNotificationsManager1 = new ToastNotificationsManager();
+ //VanishingMessage vm = new VanishingMessage(System.Drawing.Color.OrangeRed, "鎿嶄綔鎴愭槬鏍戞毊浜戦《鎴存", 1);
+ //vm.Show();
- private void tlMenu_MouseDown(object sender, MouseEventArgs e)
- {
- if (e.Button == MouseButtons.Right)
- {
- var hitInfo = tlMenu.CalcHitInfo(new Point(e.X, e.Y));
- if (hitInfo.HitInfoType == HitInfoType.Cell)
- {
- tlMenu.FocusedNode = hitInfo.Node;
- contextMenuStrip1.Show(tlMenu, e.Location);
- }
- }
- }
-
- private void toolStripMenuItem1_Click(object sender, EventArgs e)
- {
- if (tlMenu.FocusedNode != null)
- {
- // 鍒犻櫎鑺傜偣鐨勯�昏緫
- tlMenu.DeleteNode(tlMenu.FocusedNode);
- }
- }
-
- private void toolStripMenuItem2_Click(object sender, EventArgs e)
- {
- if (tlMenu.FocusedNode != null)
- {
- // 淇敼鑺傜偣鐨勯�昏緫锛屼緥濡傛洿鏀硅妭鐐瑰��
- tlMenu.FocusedNode.SetValue("鍒楀悕", "鏂板��"); // 鏇挎崲"鍒楀悕"鍜�"鏂板��"涓哄疄闄呭垪鍚嶅拰鍊�
- }
+ VanishingMessage vm = new VanishingMessage(System.Drawing.Color.DodgerBlue, "鎿嶄綔鎴愭槬鏍戞毊浜戦《鎴存", 1);
+ vm.Show();
+
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/XtraForm1.resx b/DevApp/Gs.DevApp/XtraForm1.resx
index ad53752..1af7de1 100644
--- a/DevApp/Gs.DevApp/XtraForm1.resx
+++ b/DevApp/Gs.DevApp/XtraForm1.resx
@@ -117,7 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
</root>
\ No newline at end of file
--
Gitblit v1.9.3