From bb99edc771002ae119a0641b166bfdfc0b40eef6 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期三, 10 九月 2025 18:17:15 +0800
Subject: [PATCH] 1、异常单
---
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx | 3
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs | 296 +++++++++++++++++++-
DevApp/Gs.DevApp/Gs.DevApp.csproj | 8
DevApp/Gs.DevApp/App.config | 6
DevApp/Gs.DevApp/Properties/licenses.licx | 45 +-
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | 471 ++++++++++++++++++++++----------
6 files changed, 624 insertions(+), 205 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 81aa5e1..3282871 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -36,15 +36,15 @@
</runtime>
<appSettings>
- <!--<add key="webapiurl" value="http://localhost:5263/" />-->
+ <add key="webapiurl" value="http://localhost:5263/" />
<!--<add key="WebApiUrl" value="http://192.168.8.8:8081/" />-->
- <add key="WebApiUrl" value="http://192.168.0.51:8181/" />
+ <!--<add key="WebApiUrl" value="http://192.168.0.51:8181/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
<add key="Version" value="0.1" />
<add key="IsAutoUpdater" value="0" />
- <add key="AutoUpdaterXml" value="http://192.168.8.8:86/AutoUpdater/AutoUpdater.xml" />
+ <add key="AutoUpdaterXml" value="http://192.168.0.51:8186/AutoUpdater/AutoUpdater.xml" />
<add key="ToastSeconds" value="5" /><!--鎻愮ず妗嗘椂闂�-->
<add key="AsyncSeconds" value="2" /><!--姘存瓒呮椂鏃堕棿-->
<add key="IsWater" value="0" /><!--鏄惁瑕佹按妫�鍙婂伐浣嶇爜-->
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
index 251c1c6..993cd4d 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -109,19 +109,29 @@
this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
+ this.repositoryItemLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
+ this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
+ this.repositoryItemSearchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -170,6 +180,9 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit();
@@ -178,9 +191,13 @@
((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -192,9 +209,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(987, 62);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -202,10 +220,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(987, 468);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -214,8 +233,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(985, 442);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -224,6 +244,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -236,17 +257,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.Size = new System.Drawing.Size(985, 442);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 4;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+ this.gcMain1.Size = new System.Drawing.Size(985, 402);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -256,7 +279,7 @@
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.ColumnPanelRowHeight = 39;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_fstatus,
this.gridColumn4,
@@ -274,10 +297,10 @@
this.gridColumn3,
this.gridColumn17,
this.gridColumn18,
- this.gridColumn19,
- this.gridColumn20});
+ this.gridColumn19});
+ this.gridView1.DetailHeight = 272;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 44;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -288,194 +311,202 @@
this.gv_fstatus.AppearanceCell.Options.UseFont = true;
this.gv_fstatus.Caption = "瀹℃牳";
this.gv_fstatus.FieldName = "chkStatus";
- this.gv_fstatus.MaxWidth = 50;
- this.gv_fstatus.MinWidth = 50;
+ this.gv_fstatus.MaxWidth = 44;
+ this.gv_fstatus.MinWidth = 44;
this.gv_fstatus.Name = "gv_fstatus";
this.gv_fstatus.OptionsColumn.AllowEdit = false;
this.gv_fstatus.Tag = "query_a.fstatus";
this.gv_fstatus.Visible = true;
this.gv_fstatus.VisibleIndex = 0;
- this.gv_fstatus.Width = 50;
+ this.gv_fstatus.Width = 44;
//
// gridColumn4
//
this.gridColumn4.Caption = "涓婚敭GUID";
this.gridColumn4.FieldName = "guid";
+ this.gridColumn4.MinWidth = 17;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Tag = "org.fnamber";
- this.gridColumn4.Width = 250;
+ this.gridColumn4.Width = 219;
//
// gridColumn1
//
this.gridColumn1.Caption = "绫诲埆";
this.gridColumn1.FieldName = "fType";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 22;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 14;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.VisibleIndex = 15;
+ this.gridColumn1.Width = 82;
//
// gridColumn2
//
this.gridColumn2.Caption = "寤虹珛鑰�";
this.gridColumn2.FieldName = "createBy";
+ this.gridColumn2.MinWidth = 17;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 10;
- this.gridColumn2.Width = 150;
+ this.gridColumn2.Width = 131;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "寤虹珛鏃堕棿";
this.gv_checkUser.FieldName = "createDate";
+ this.gv_checkUser.MinWidth = 17;
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
this.gv_checkUser.VisibleIndex = 11;
- this.gv_checkUser.Width = 94;
+ this.gv_checkUser.Width = 82;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鑰�";
this.gv_checkDate.FieldName = "checkBy";
+ this.gv_checkDate.MinWidth = 17;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
this.gv_checkDate.VisibleIndex = 12;
- this.gv_checkDate.Width = 180;
+ this.gv_checkDate.Width = 157;
//
// gv_pba005
//
this.gv_pba005.AppearanceCell.Options.UseFont = true;
this.gv_pba005.Caption = "瀹℃牳鏃堕棿";
this.gv_pba005.FieldName = "checkDate";
+ this.gv_pba005.MinWidth = 17;
this.gv_pba005.Name = "gv_pba005";
this.gv_pba005.OptionsColumn.AllowEdit = false;
this.gv_pba005.Tag = "query_a.pba005";
this.gv_pba005.Visible = true;
this.gv_pba005.VisibleIndex = 13;
- this.gv_pba005.Width = 94;
+ this.gv_pba005.Width = 82;
//
// gridColumn8
//
this.gridColumn8.Caption = "鐗╂枡缂栫爜";
this.gridColumn8.FieldName = "itemNo";
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 22;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 5;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.Width = 82;
//
// gridColumn9
//
this.gridColumn9.Caption = "鐗╂枡鍚嶇О";
this.gridColumn9.FieldName = "itemName";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 22;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 6;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 82;
//
// gridColumn10
//
this.gridColumn10.Caption = "鐗╂枡瑙勬牸";
this.gridColumn10.FieldName = "itemModel";
- this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.MinWidth = 22;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 7;
- this.gridColumn10.Width = 94;
+ this.gridColumn10.Width = 82;
//
// gridColumn11
//
this.gridColumn11.Caption = "渚涘簲鍟�";
this.gridColumn11.FieldName = "gysName";
- this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.MinWidth = 22;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 8;
- this.gridColumn11.Width = 94;
+ this.gridColumn11.Width = 82;
//
// gridColumn12
//
this.gridColumn12.Caption = "鍒拌揣鏃ユ湡";
this.gridColumn12.FieldName = "dhdDate";
- this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.MinWidth = 22;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 4;
- this.gridColumn12.Width = 94;
+ this.gridColumn12.Width = 82;
//
// gridColumn13
//
this.gridColumn13.Caption = "鍒拌揣鍗曞彿";
this.gridColumn13.FieldName = "dhdNo";
- this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.MinWidth = 22;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 3;
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 82;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡ID";
this.gridColumn3.FieldName = "itemId";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 22;
this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 14;
+ this.gridColumn3.Width = 82;
//
// gridColumn17
//
this.gridColumn17.Caption = "寮傚父鍗曞彿";
this.gridColumn17.FieldName = "fBillNo";
- this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.MinWidth = 22;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 1;
- this.gridColumn17.Width = 94;
+ this.gridColumn17.Width = 82;
//
// gridColumn18
//
this.gridColumn18.Caption = "OA澶勭悊鐘舵��";
this.gridColumn18.FieldName = "oaCheckStatusTxt";
- this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.MinWidth = 22;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 2;
- this.gridColumn18.Width = 94;
+ this.gridColumn18.Width = 82;
//
// gridColumn19
//
this.gridColumn19.Caption = "OA澶勭悊鏃堕棿";
this.gridColumn19.FieldName = "oaCheckDate";
- this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.MinWidth = 22;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 9;
- this.gridColumn19.Width = 94;
+ this.gridColumn19.Width = 82;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 402);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(985, 30);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(985, 442);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -483,6 +514,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -495,8 +527,8 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 163;
+ this.splitMx1.Size = new System.Drawing.Size(985, 442);
+ this.splitMx1.SplitterPosition = 127;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -518,107 +550,119 @@
this.layoutControlItem9,
this.layoutControlItem24});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(598, 453, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 163);
+ this.layoutMx1.Size = new System.Drawing.Size(985, 127);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(840, 99);
+ this.lbGuid.Location = new System.Drawing.Point(735, 77);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(274, 40);
+ this.lbGuid.Size = new System.Drawing.Size(240, 31);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(927, 12);
+ this.txt_fType.Location = new System.Drawing.Point(795, 12);
+ this.txt_fType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_fType.Name = "txt_fType";
- this.txt_fType.Size = new System.Drawing.Size(187, 24);
+ this.txt_fType.Size = new System.Drawing.Size(161, 20);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 462;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(99, 40);
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 36);
+ this.txt_itemNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Size = new System.Drawing.Size(185, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(161, 20);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 464;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(375, 40);
+ this.txt_itemName.Location = new System.Drawing.Point(321, 36);
+ this.txt_itemName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(185, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(161, 20);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 465;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(651, 40);
+ this.txt_itemModel.Location = new System.Drawing.Point(558, 36);
+ this.txt_itemModel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(463, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(398, 20);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 466;
//
// txt_dhdNo
//
- this.txt_dhdNo.Location = new System.Drawing.Point(375, 12);
+ this.txt_dhdNo.Location = new System.Drawing.Point(321, 12);
+ this.txt_dhdNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_dhdNo.Name = "txt_dhdNo";
- this.txt_dhdNo.Size = new System.Drawing.Size(185, 24);
+ this.txt_dhdNo.Size = new System.Drawing.Size(161, 20);
this.txt_dhdNo.StyleController = this.layoutMx1;
this.txt_dhdNo.TabIndex = 467;
//
// txt_gysNo
//
- this.txt_gysNo.Location = new System.Drawing.Point(99, 68);
+ this.txt_gysNo.Location = new System.Drawing.Point(84, 60);
+ this.txt_gysNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_gysNo.Name = "txt_gysNo";
- this.txt_gysNo.Size = new System.Drawing.Size(185, 24);
+ this.txt_gysNo.Size = new System.Drawing.Size(161, 20);
this.txt_gysNo.StyleController = this.layoutMx1;
this.txt_gysNo.TabIndex = 468;
//
// txt_gysName
//
- this.txt_gysName.Location = new System.Drawing.Point(375, 68);
+ this.txt_gysName.Location = new System.Drawing.Point(321, 60);
+ this.txt_gysName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_gysName.Name = "txt_gysName";
- this.txt_gysName.Size = new System.Drawing.Size(461, 24);
+ this.txt_gysName.Size = new System.Drawing.Size(398, 20);
this.txt_gysName.StyleController = this.layoutMx1;
this.txt_gysName.TabIndex = 469;
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(927, 180);
+ this.txt_guid.Location = new System.Drawing.Point(811, 140);
+ this.txt_guid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(187, 24);
+ this.txt_guid.Size = new System.Drawing.Size(164, 20);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 477;
//
// txt_fBillNo
//
- this.txt_fBillNo.Location = new System.Drawing.Point(99, 12);
+ this.txt_fBillNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_fBillNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_fBillNo.Name = "txt_fBillNo";
- this.txt_fBillNo.Size = new System.Drawing.Size(185, 24);
+ this.txt_fBillNo.Size = new System.Drawing.Size(161, 20);
this.txt_fBillNo.StyleController = this.layoutMx1;
this.txt_fBillNo.TabIndex = 478;
//
// txt_dhdDate
//
- this.txt_dhdDate.Location = new System.Drawing.Point(651, 12);
+ this.txt_dhdDate.Location = new System.Drawing.Point(558, 12);
+ this.txt_dhdDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_dhdDate.Name = "txt_dhdDate";
- this.txt_dhdDate.Size = new System.Drawing.Size(185, 24);
+ this.txt_dhdDate.Size = new System.Drawing.Size(161, 20);
this.txt_dhdDate.StyleController = this.layoutMx1;
this.txt_dhdDate.TabIndex = 481;
//
// txt_fngDesc
//
- this.txt_fngDesc.Location = new System.Drawing.Point(99, 97);
+ this.txt_fngDesc.Location = new System.Drawing.Point(84, 84);
+ this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(1015, 54);
+ this.txt_fngDesc.Size = new System.Drawing.Size(872, 44);
this.txt_fngDesc.StyleController = this.layoutMx1;
this.txt_fngDesc.TabIndex = 485;
//
@@ -643,7 +687,7 @@
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5;
this.layoutControlItem24.Size = new System.Drawing.Size(278, 34);
this.layoutControlItem24.Text = "涓婚敭Guid";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(50, 20);
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(44, 16);
//
// Root
//
@@ -691,7 +735,7 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1126, 163);
+ this.Root.Size = new System.Drawing.Size(968, 140);
this.Root.TextVisible = false;
//
// layoutControlItem2
@@ -699,114 +743,115 @@
this.layoutControlItem2.Control = this.txt_fBillNo;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem2.Text = "寮傚父缂栧彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_dhdNo;
- this.layoutControlItem14.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem14.Location = new System.Drawing.Point(237, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem14.Text = "鍒拌揣鍗曞彿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_dhdDate;
- this.layoutControlItem4.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(474, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem4.Text = "鍒拌揣鍗曟棩鏈�";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemNo;
- this.layoutControlItem11.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem11.Location = new System.Drawing.Point(0, 24);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem11.Text = "鐗╂枡缂栧彿";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_fType;
- this.layoutControlItem1.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem1.Location = new System.Drawing.Point(711, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem1.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem1.Text = "寮傚父绫诲瀷";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_itemName;
- this.layoutControlItem12.Location = new System.Drawing.Point(276, 28);
+ this.layoutControlItem12.Location = new System.Drawing.Point(237, 24);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem12.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_itemModel;
- this.layoutControlItem13.Location = new System.Drawing.Point(552, 28);
+ this.layoutControlItem13.Location = new System.Drawing.Point(474, 24);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(554, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(474, 24);
this.layoutControlItem13.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_gysNo;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 48);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem15.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_gysName;
- this.layoutControlItem16.Location = new System.Drawing.Point(276, 56);
+ this.layoutControlItem16.Location = new System.Drawing.Point(237, 48);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(552, 29);
+ this.layoutControlItem16.Size = new System.Drawing.Size(474, 24);
this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 14);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_fngDesc;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 85);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 72);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnSpan = 4;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem3.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(1106, 58);
+ this.layoutControlItem3.Size = new System.Drawing.Size(948, 48);
this.layoutControlItem3.Text = "寮傚父鎻忚堪";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 14);
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 395);
+ this.tabMx.Size = new System.Drawing.Size(985, 305);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -814,23 +859,31 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 363);
+ this.tabMxPage1.Size = new System.Drawing.Size(983, 279);
this.tabMxPage1.Text = "寮傚父鏄庣粏";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemDateEdit1,
this.repositoryItemDateEdit2,
this.repositoryItemButtonEdit1,
this.rptJYBZ,
- this.repositoryItemDateEdit3});
- this.gcMx1.Size = new System.Drawing.Size(1124, 363);
+ this.repositoryItemDateEdit3,
+ this.repositoryItemLookUpEdit1,
+ this.repositoryItemComboBox1,
+ this.repositoryItemSearchLookUpEdit1,
+ this.repositoryItemComboBox2,
+ this.repositoryItemComboBox3});
+ this.gcMx1.Size = new System.Drawing.Size(983, 279);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -839,7 +892,7 @@
//
this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx1.ColumnPanelRowHeight = 50;
+ this.gvMx1.ColumnPanelRowHeight = 39;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.caaGuid,
@@ -853,7 +906,12 @@
this.gvMx1reporttime,
this.gridColumn14,
this.gridColumn15,
- this.gridColumn16});
+ this.gridColumn16,
+ this.gridColumn20,
+ this.gridColumn21,
+ this.gridColumn22,
+ this.gridColumn23});
+ this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -865,115 +923,126 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 50;
+ this.gvMx1guid.MinWidth = 44;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
+ this.gvMx1guid.Width = 82;
//
// caaGuid
//
this.caaGuid.Caption = "鐖朵翰GUID";
this.caaGuid.FieldName = "pGuid";
- this.caaGuid.MinWidth = 25;
+ this.caaGuid.MinWidth = 22;
this.caaGuid.Name = "caaGuid";
this.caaGuid.OptionsColumn.ReadOnly = true;
- this.caaGuid.Width = 94;
+ this.caaGuid.Width = 82;
//
// gvMx1daa002
//
this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
this.gvMx1daa002.Caption = "搴忓彿";
this.gvMx1daa002.FieldName = "fSeq";
- this.gvMx1daa002.MinWidth = 50;
+ this.gvMx1daa002.MinWidth = 44;
this.gvMx1daa002.Name = "gvMx1daa002";
this.gvMx1daa002.OptionsColumn.ReadOnly = true;
this.gvMx1daa002.Tag = "query_a.daa002";
this.gvMx1daa002.Visible = true;
this.gvMx1daa002.VisibleIndex = 0;
- this.gvMx1daa002.Width = 50;
+ this.gvMx1daa002.Width = 44;
//
// gridColumn5
//
this.gridColumn5.Caption = "妫�楠屽崟鍙�";
this.gridColumn5.FieldName = "releaseNo";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 22;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 1;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 82;
//
// gridColumn6
//
this.gridColumn6.Caption = "妫�楠屾棩鏈�";
this.gridColumn6.FieldName = "jyDate";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 22;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 4;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 82;
//
// gvMx1daa005
//
this.gvMx1daa005.AppearanceCell.Options.UseFont = true;
this.gvMx1daa005.Caption = "鎵规鏁伴噺";
this.gvMx1daa005.FieldName = "batchQty";
- this.gvMx1daa005.MinWidth = 50;
+ this.gvMx1daa005.MinWidth = 44;
this.gvMx1daa005.Name = "gvMx1daa005";
this.gvMx1daa005.OptionsColumn.ReadOnly = true;
this.gvMx1daa005.Tag = "query_a.daa005";
this.gvMx1daa005.Visible = true;
this.gvMx1daa005.VisibleIndex = 2;
- this.gvMx1daa005.Width = 50;
+ this.gvMx1daa005.Width = 44;
//
// gridColumn7
//
this.gridColumn7.Caption = "鎶芥牱鏁�";
this.gridColumn7.FieldName = "chouQty";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 22;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 3;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 82;
//
// gvMx1daa004
//
this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
this.gvMx1daa004.Caption = "涓嶈壇鏁�";
this.gvMx1daa004.FieldName = "badQty";
- this.gvMx1daa004.MinWidth = 50;
+ this.gvMx1daa004.MinWidth = 44;
this.gvMx1daa004.Name = "gvMx1daa004";
this.gvMx1daa004.OptionsColumn.ReadOnly = true;
this.gvMx1daa004.Tag = "query_a.daa004";
this.gvMx1daa004.Visible = true;
this.gvMx1daa004.VisibleIndex = 5;
- this.gvMx1daa004.Width = 50;
+ this.gvMx1daa004.Width = 44;
//
// gvMx1daa008
//
this.gvMx1daa008.AppearanceCell.Options.UseFont = true;
this.gvMx1daa008.Caption = "涓嶈壇鐜�";
this.gvMx1daa008.FieldName = "badProb";
- this.gvMx1daa008.MaxWidth = 50;
- this.gvMx1daa008.MinWidth = 50;
+ this.gvMx1daa008.MaxWidth = 44;
+ this.gvMx1daa008.MinWidth = 44;
this.gvMx1daa008.Name = "gvMx1daa008";
this.gvMx1daa008.OptionsColumn.ReadOnly = true;
this.gvMx1daa008.Tag = "query_a.daa008";
this.gvMx1daa008.Visible = true;
this.gvMx1daa008.VisibleIndex = 6;
- this.gvMx1daa008.Width = 50;
+ this.gvMx1daa008.Width = 44;
//
// gvMx1reporttime
//
this.gvMx1reporttime.AppearanceCell.Options.UseFont = true;
this.gvMx1reporttime.Caption = "閫夊埆绫诲瀷";
+ this.gvMx1reporttime.ColumnEdit = this.repositoryItemComboBox2;
this.gvMx1reporttime.FieldName = "chooseType";
- this.gvMx1reporttime.MinWidth = 50;
+ this.gvMx1reporttime.MinWidth = 44;
this.gvMx1reporttime.Name = "gvMx1reporttime";
this.gvMx1reporttime.Tag = "edit";
this.gvMx1reporttime.Visible = true;
this.gvMx1reporttime.VisibleIndex = 7;
- this.gvMx1reporttime.Width = 102;
+ this.gvMx1reporttime.Width = 89;
+ //
+ // repositoryItemComboBox2
+ //
+ this.repositoryItemComboBox2.AutoHeight = false;
+ this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox2.Items.AddRange(new object[] {
+ "閫夊埆绫诲埆1",
+ "閫夊埆绫诲埆2"});
+ this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
//
// gridColumn14
//
@@ -982,32 +1051,97 @@
this.gridColumn14.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gridColumn14.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn14.Caption = "澶勭疆鎰忚";
+ this.gridColumn14.ColumnEdit = this.repositoryItemComboBox1;
this.gridColumn14.FieldName = "handResult";
- this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.MinWidth = 22;
this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.None, "handResult", "", "1"),
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.None, "handResult", "", "2")});
+ this.gridColumn14.Tag = "edit";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 8;
- this.gridColumn14.Width = 94;
+ this.gridColumn14.Width = 82;
+ //
+ // repositoryItemComboBox1
+ //
+ this.repositoryItemComboBox1.AutoHeight = false;
+ this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox1.Items.AddRange(new object[] {
+ "閫�璐�",
+ "鐗归噰鐩存帴浣跨敤"});
+ this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
//
// gridColumn15
//
this.gridColumn15.Caption = "閫夊埆鏁伴噺";
this.gridColumn15.FieldName = "chooseQty";
- this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.MinWidth = 22;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 9;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.VisibleIndex = 10;
+ this.gridColumn15.Width = 82;
//
// gridColumn16
//
this.gridColumn16.Caption = "涓嶅悎鏍兼弿杩�";
this.gridColumn16.FieldName = "fngDesc";
- this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.MinWidth = 22;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 10;
- this.gridColumn16.Width = 94;
+ this.gridColumn16.VisibleIndex = 11;
+ this.gridColumn16.Width = 82;
+ //
+ // gridColumn20
+ //
+ this.gridColumn20.Caption = "鍚堟牸鍏ュ簱鏁�";
+ this.gridColumn20.FieldName = "okRkqty";
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Tag = "";
+ this.gridColumn20.Visible = true;
+ this.gridColumn20.VisibleIndex = 12;
+ this.gridColumn20.Width = 66;
+ //
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "宸ュ簾鍏ュ簱鏁�";
+ this.gridColumn21.FieldName = "gfRkqty";
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.Tag = "edit";
+ this.gridColumn21.Visible = true;
+ this.gridColumn21.VisibleIndex = 13;
+ this.gridColumn21.Width = 66;
+ //
+ // gridColumn22
+ //
+ this.gridColumn22.Caption = "鏂欏簾鍏ュ簱鏁�";
+ this.gridColumn22.FieldName = "lfRkqty";
+ this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.Tag = "edit";
+ this.gridColumn22.Visible = true;
+ this.gridColumn22.VisibleIndex = 14;
+ this.gridColumn22.Width = 66;
+ //
+ // gridColumn23
+ //
+ this.gridColumn23.Caption = "閫�鏂欐柟寮�";
+ this.gridColumn23.ColumnEdit = this.repositoryItemComboBox3;
+ this.gridColumn23.FieldName = "process";
+ this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.Tag = "edit";
+ this.gridColumn23.Visible = true;
+ this.gridColumn23.VisibleIndex = 9;
+ //
+ // repositoryItemComboBox3
+ //
+ this.repositoryItemComboBox3.AutoHeight = false;
+ this.repositoryItemComboBox3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox3.Items.AddRange(new object[] {
+ "閫�鏂欒ˉ鏂�",
+ "閫�鏂欏苟鎵ｆ"});
+ this.repositoryItemComboBox3.Name = "repositoryItemComboBox3";
//
// repositoryItemDateEdit1
//
@@ -1055,11 +1189,34 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.repositoryItemDateEdit3.Name = "repositoryItemDateEdit3";
//
+ // repositoryItemLookUpEdit1
+ //
+ this.repositoryItemLookUpEdit1.AutoHeight = false;
+ this.repositoryItemLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemLookUpEdit1.Name = "repositoryItemLookUpEdit1";
+ //
+ // repositoryItemSearchLookUpEdit1
+ //
+ this.repositoryItemSearchLookUpEdit1.AutoHeight = false;
+ this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1";
+ this.repositoryItemSearchLookUpEdit1.PopupView = this.repositoryItemSearchLookUpEdit1View;
+ //
+ // repositoryItemSearchLookUpEdit1View
+ //
+ this.repositoryItemSearchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+ this.repositoryItemSearchLookUpEdit1View.Name = "repositoryItemSearchLookUpEdit1View";
+ this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+ this.repositoryItemSearchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+ //
// picCheckBox
//
- this.picCheckBox.Location = new System.Drawing.Point(1024, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(896, 43);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.Size = new System.Drawing.Size(88, 39);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 7;
this.picCheckBox.TabStop = false;
@@ -1079,24 +1236,15 @@
this.layoutControlItem10.Size = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextSize = new System.Drawing.Size(50, 20);
//
- // gridColumn20
- //
- this.gridColumn20.Caption = "鏀舵枡缁勭粐";
- this.gridColumn20.FieldName = "fSubsidiary";
- this.gridColumn20.MinWidth = 25;
- this.gridColumn20.Name = "gridColumn20";
- this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 15;
- this.gridColumn20.Width = 94;
- //
// MesQcExceptional
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(987, 530);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "MesQcExceptional";
this.Text = "IQC寮傚父鎶ュ憡";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1147,6 +1295,9 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).EndInit();
@@ -1155,9 +1306,13 @@
((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemLookUpEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
this.ResumeLayout(false);
}
@@ -1241,5 +1396,15 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit repositoryItemLookUpEdit1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
+ private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit1View;
+ private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
index d2c2e0f..ddf3ed8 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
@@ -6,8 +6,10 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.Diagnostics;
using System.Threading.Tasks;
using System.Windows.Forms;
+
namespace Gs.DevApp.DevFrm.QC
{
@@ -28,8 +30,14 @@
InitializeComponent();
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+ this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
@@ -45,6 +53,10 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+
+
+
+
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -124,7 +136,7 @@
}
}
/// <summary>
- /// 瀹℃牳浜嬩欢
+ /// 瀹℃牳浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -132,6 +144,164 @@
{
_toolCk(1);
}
+ /// <summary>
+ /// 鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ {
+ _toolCk(0);
+ }
+ /// <summary>
+ /// 鍙栨秷浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+ }
+ /// <summary>
+ /// 淇敼浜嬩欢
+ /// </summary>
+ /// <param name="sender">浜嬩欢鍙戦�佽��</param>
+ /// <param name="e">浜嬩欢鍙傛暟</param>
+ private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+ {
+ // 璁剧疆褰撳墠鎿嶄綔妯″紡涓虹紪杈戠姸鎬�
+ toolBarMenu1.currentAction = "edit";
+ // 瀹氫箟鍙橀噺瀛樺偍閫変腑琛岀殑鍞竴鏍囪瘑鍜屽悕绉�
+ string rowGuid = "", rowName = "";
+ // 浠庡綋鍓嶆椿鍔ㄨ〃鏍间腑鑾峰彇閫変腑琛岀殑鍏抽敭淇℃伅
+ // 鍙傛暟璇存槑锛�
+ // - xtraTabControl1锛氭爣绛鹃〉鎺т欢锛岀敤浜庣‘瀹氬綋鍓嶆椿鍔ㄩ〉
+ // - lbGuid锛氭樉绀篏UID鐨勬爣绛炬帶浠�
+ // - txt_releaseNo锛氭樉绀哄彂甯冪紪鍙风殑鏂囨湰妗�
+ // - gridView1锛氫富琛ㄦ牸瑙嗗浘
+ // - "releaseNo"锛氳鑾峰彇鐨勫垪鍚�
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "fBillNo");
+ // 楠岃瘉鏄惁閫変腑鏈夋晥琛�
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ // 鏈�変腑鏃舵彁绀虹敤鎴峰苟缁堟鎿嶄綔
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ // 瀵艰埅鍒扮紪杈戦〉闈�(绗�4涓爣绛鹃〉锛岀储寮曚粠0寮�濮�)
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+ // 鏍规嵁褰撳墠娲诲姩鏍囩椤垫墽琛屼笉鍚岀殑鍒濆鍖栭�昏緫
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ // 濡傛灉鏄壒瀹氭爣绛鹃〉(绗�2椤�)锛屽姞杞藉畬鏁存暟鎹ā鍨�
+ // 鍙傛暟璇存槑锛�
+ // - rowGuid锛氶�変腑琛岀殑鍞竴鏍囪瘑
+ getModel(rowGuid);
+ }
+ else
+ {
+ // 鍏朵粬鏍囩椤电殑缂栬緫妯″紡鍒濆鍖�
+ // 鍒涘缓闇�瑕佺壒娈婂鐞嗙殑琛ㄦ牸瑙嗗浘鍒楄〃
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1); // 娣诲姞鏄庣粏琛ㄨ鍥�1
+
+ // 鍚敤缂栬緫妯″紡涓嬬殑鎵�鏈夋帶浠�
+ // 鍙傛暟璇存槑锛�
+ // - this.layoutMx1.Controls锛氳鍚敤鐨勬帶浠跺鍣�
+ // - true锛氬惎鐢ㄦ爣蹇�
+ // - gvList锛氶渶瑕佺壒娈婂鐞嗙殑琛ㄦ牸瑙嗗浘鍒楄〃
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
+
+
+ }
+ }
+
+ /// <summary>
+ /// 淇濆瓨 -鎸夐挳鐐瑰嚮浜嬩欢 澶勭悊寮傚父鍗曟槑缁嗙殑淇濆瓨閫昏緫
+ /// </summary>
+ /// <param name="sender">浜嬩欢鍙戦�佽��</param>
+ /// <param name="e">浜嬩欢鍙傛暟</param>
+ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+ {
+ // 1. 鍒濆鍖栦繚瀛樼姸鎬�
+ toolBarMenu1.isSetBtn = false; // 绂佺敤宸ュ叿鏍忔寜閽姸鎬佽缃�
+ // 2. 鏋勫缓璇锋眰瀵硅薄
+ var _obj = new
+ {
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓昏〃涓诲缓
+ list = new List<dynamic>(), // 鏄庣粏鏁版嵁鍒楄〃
+ };
+ // 3. 鏁版嵁楠岃瘉涓庡噯澶�
+ gvMx1.CloseEditor(); // 鍏抽棴娲诲姩缂栬緫鍣�
+ gvMx1.PostEditor(); // 鎻愪氦缂栬緫鐨勫��
+ gvMx1.UpdateCurrentRow(); // 鏇存柊褰撳墠琛屾暟鎹�
+ // 楠岃瘉鏄庣粏鏄惁涓虹┖
+ if (gvMx1.DataRowCount <= 0)
+ {
+ MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑寮傚父鍗曟槑缁嗭紒");
+ return;
+ }
+ // 4. 鏀堕泦鏄庣粏鏁版嵁
+ for (var i = 0; i < gvMx1.DataRowCount; i++)
+ {
+
+ var row = gvMx1.GetDataRow(i);
+ if (row != null)
+ {
+ // 鑾峰彇褰撳墠鏄庣粏琛岀殑GUID
+ Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
+ // 娣诲姞鏄庣粏椤瑰埌璇锋眰瀵硅薄
+ _obj.list.Add(new
+ {
+ Guid = _guid,
+ BatchQty = (row["batchQty"].ToString()), // 鎵规鏁伴噺
+ GfRkqty = (row["gfRkqty"].ToString()), // 鍚堟牸鍏ュ簱鏁伴噺
+ LfRkqtyz = (row["lfRkqty"].ToString()), // 涓嶅悎鏍煎叆搴撴暟閲�
+ HandResult = (row["handResult"].ToString()), // 閫夊埆绫诲瀷
+ ChooseType = (row["chooseType"].ToString()), // 澶勭悊鎰忚
+ Process = (row["process"].ToString()), // 閫�鏂欐柟寮�
+
+ });
+ }
+ }
+ // 5. 鍙戦�佷繚瀛樿姹�
+ try
+ {
+ // 搴忓垪鍖栧璞″苟璋冪敤WebService
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+ // 瑙ｆ瀽杩斿洖缁撴灉
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ // 6. 澶勭悊淇濆瓨鎴愬姛閫昏緫
+ if (_rtn.rtnCode > 0)
+ {
+ // 鏇存柊涓昏〃GUID
+ lbGuid.Text = _rtn.rtnData.outGuid;
+ // 鎭㈠宸ュ叿鏍忕姸鎬�
+ toolBarMenu1.isSetBtn = true;
+ // 绂佺敤缂栬緫鎺т欢
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+ // 閲嶇疆鎿嶄綔鐘舵��
+ toolBarMenu1.currentAction = "";
+ // 銆愭柊澧炲埛鏂伴�昏緫銆戜繚瀛樻垚鍔熷悗绔嬪嵆鍒锋柊褰撳墠妯″瀷鏁版嵁鍜屽垪琛�
+ // 鍒锋柊褰撳墠鍗曟嵁璇︽儏
+ getModel(lbGuid.Text.Trim());
+ // 鍒锋柊鍒楄〃椤垫暟鎹�
+ getPageList(this.pageBar1.CurrentPage);
+
+ // 璺宠浆鍒版煡鐪嬬粨鏋滈〉闈�
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
/// <summary>
///
@@ -140,11 +310,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null;
- System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and arn.ReceiveOrgId in");
- _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
- _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -177,78 +343,156 @@
}
catch (Exception ex)
{
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+
/// <summary>
- /// 璇诲彇瀹炰綋
+ /// 璇诲彇瀹炰綋鏁版嵁锛堟牴鎹敮涓�鏍囪瘑GUID鍔犺浇璇︽儏锛屽苟灏嗘暟鎹粦瀹氬埌鐣岄潰鎺т欢锛�
+ /// 鍔熻兘锛氫粠鏈嶅姟绔幏鍙栨寚瀹氳川閲忔帶鍒跺紓甯歌褰曠殑璇︾粏淇℃伅锛屽寘鎷富鏁版嵁鍜屾槑缁嗘暟鎹紝
+ /// 骞舵牴鎹搷浣滅姸鎬侊紙鏌ョ湅/缂栬緫锛夎缃晫闈㈡帶浠剁殑鍙紪杈戞��
/// </summary>
- /// <param name="strGuid"></param>
+ /// <param name="strGuid">瀹炰綋鐨勫敮涓�鏍囪瘑锛圙UID鏍煎紡鐨勪富閿紝鐢ㄤ簬瀹氫綅鍏蜂綋璁板綍锛�</param>
private void getModel(string strGuid)
{
+ // 瀹氫箟鍙橀噺鏍囪褰撳墠鏄惁涓虹紪杈戠姸鎬侊紙榛樿闈炵紪杈戠姸鎬侊級
bool isEdit = false;
+
+ // 鑻ュ綋鍓嶅伐鍏锋爮鎿嶄綔鏄�"鏂板"锛坅dd锛夛紝鏃犻渶鍔犺浇宸叉湁鏁版嵁锛岀洿鎺ヨ繑鍥�
+ // 鍘熷洜锛氭柊澧炵姸鎬佷笅搴旀樉绀虹┖鐧借〃鍗曪紝鑰岄潪鍔犺浇鍘嗗彶鏁版嵁
if (toolBarMenu1.currentAction == "add") return;
+
+ // 鑻ュ綋鍓嶅伐鍏锋爮鎿嶄綔鏄�"缂栬緫"锛坋dit锛夛紝灏嗙紪杈戠姸鎬佹爣璁颁负true
+ // 鍚庣画鐣岄潰鎺т欢鐨勫彲缂栬緫鎬у皢鍩轰簬姝ゅ彉閲忓垽鏂�
if (toolBarMenu1.currentAction == "edit") isEdit = true;
+
+ // 鏍￠獙鍙傛暟锛氳嫢鏈紶鍏ユ湁鏁堢殑GUID锛堢敤鎴锋湭閫夋嫨浠讳綍琛岋級锛屾彁绀虹敤鎴峰苟缁堟鎵ц
if (string.IsNullOrEmpty(strGuid))
{
- MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ // 寮瑰嚭璀﹀憡鎻愮ず妗嗭紝寮曞鐢ㄦ埛鍏堥�夋嫨鎿嶄綔琛�
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
+
+ // 鏋勫缓璇锋眰鍙傛暟瀵硅薄锛氫互鍖垮悕绫诲舰寮忓皝瑁呰鏌ヨ鐨勫疄浣撲富閿紙GUID锛�
+ // 璇ュ弬鏁板皢鐢ㄤ簬鍚戞湇鍔＄璇锋眰瀵瑰簲鐨勫疄浣撴暟鎹�
var _obj = new
{
- guid = strGuid,//涓诲缓
+ guid = strGuid,// 涓婚敭瀛楁锛屾湇鍔＄閫氳繃姝ゅ�煎畾浣嶅叿浣撹褰�
};
+
try
{
+ // 璋冪敤HTTP宸ュ叿绫诲彂閫丳OST璇锋眰锛岃幏鍙栨湇鍔＄杩斿洖鐨凧SON鏁版嵁
+ // 鍙傛暟璇存槑锛�
+ // 绗竴涓弬鏁帮細绌哄瓧绗︿覆锛堝熀纭�URL鍙兘鍦║tilityHelper鍐呴儴棰勮锛�
+ // 绗簩涓弬鏁帮細鎺ュ彛璺緞锛堢粨鍚坃webServiceName鍓嶇紑锛屽畬鏁磋矾寰勪负"MesQcExceptionalManager/GetModel"锛�
+ // 绗笁涓弬鏁帮細灏嗘煡璇㈠弬鏁板簭鍒楀寲涓篔SON瀛楃涓�
string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+
+ // 灏嗘湇鍔＄杩斿洖鐨凧SON瀛楃涓茶浆鎹负閫氱敤杩斿洖妯″瀷锛圧eturnModel锛�
+ // ReturnModel鍖呭惈鐘舵�佺爜锛坮tnCode锛夈�佹秷鎭紙rtnMsg锛夈�佹暟鎹紙rtnData锛変笁涓牳蹇冨瓧娈�
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+
+ // 妫�鏌ユ湇鍔＄杩斿洖鐘舵�侊細rtnCode > 0 琛ㄧず璇锋眰鎴愬姛锛堜笟鍔″眰闈㈢殑鎴愬姛锛�
if (_rtn.rtnCode > 0)
{
+ // 鎻愬彇杩斿洖鏁版嵁涓殑瀹炰綋璇︽儏锛坉ynamic绫诲瀷鍙姩鎬佽闂瓧娈碉紝鏃犻渶棰勫厛瀹氫箟瀹炰綋绫伙級
dynamic dy = _rtn.rtnData;
+
+ // 鍦ㄧ晫闈㈢殑lbGuid鏍囩涓婃樉绀哄綋鍓嶅疄浣撶殑GUID锛堢敤浜庢爣璇嗗綋鍓嶆搷浣滅殑璁板綍锛�
lbGuid.Text = strGuid;
+
+ // 鍒涘缓缃戞牸瑙嗗浘鍒楄〃锛屽寘鍚渶瑕佸鐞嗙殑鏄庣粏缃戞牸瑙嗗浘gvMx1
+ // 鍚庣画灏嗛�氳繃宸ュ叿鏂规硶缁熶竴璁剧疆杩欎簺缃戞牸鐨勫睘鎬э紙濡傚彲缂栬緫鎬э級
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
+
+ // 璋冪敤宸ュ叿鏂规硶鎵归噺璁剧疆鐣岄潰鎺т欢鐨勫�煎拰鍙紪杈戠姸鎬�
+ // 鍙傛暟璇存槑锛�
+ // this.layoutMx1.Controls锛氬竷灞�瀹瑰櫒涓殑鎵�鏈夋帶浠讹紙鏂囨湰妗嗐�佷笅鎷夋绛夛級
+ // dy锛氭湇鍔＄杩斿洖鐨勫疄浣撴暟鎹紙鐢ㄤ簬涓烘帶浠惰祴鍊硷級
+ // isEdit锛氭槸鍚︿负缂栬緫鐘舵�侊紙鎺у埗鎺т欢鏄惁鍙紪杈戯級
+ // gvList锛氶渶瑕佸悓姝ヨ缃殑缃戞牸瑙嗗浘鍒楄〃
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+
+
+ // 瑙ｆ瀽鏈嶅姟绔繑鍥炵殑JSON锛屾彁鍙栨槑缁嗘暟鎹垪琛紙瀛樺偍鍦╮tnData涓嬬殑list瀛楁涓級
+ // 浣跨敤JObject瑙ｆ瀽JSON锛屼究浜庢彁鍙栧祵濂楃粨鏋勭殑鏁版嵁
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
+ // 閬嶅巻list鏁扮粍涓殑鎵�鏈夊厓绱狅紝娣诲姞鍒版柊鐨凧Array涓紙绛涢�夋槑缁嗘暟鎹級
foreach (var a in _job["rtnData"]["list"])
{
array.Add(a);
}
+
+ // 灏嗘槑缁嗘暟鎹殑JSON鏁扮粍杞崲涓篋ataTable锛堥�傚悎浣滀负缃戞牸鎺т欢鐨勬暟鎹簮锛�
DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+
+ // 鑻ユ槑缁嗘暟鎹瓨鍦紙DataTable琛屾暟>0锛�
if (dt.Rows.Count > 0)
{
+ // 涓虹綉鏍兼帶浠秅cMx1璁剧疆鏂扮殑缁戝畾涓婁笅鏂囷紙BindingContext锛�
+ // 鐩殑锛氶伩鍏嶄笌鍏朵粬鎺т欢鍏变韩缁戝畾涓婁笅鏂囧鑷寸殑鏁版嵁鍒锋柊鍐茬獊
gcMx1.BindingContext = new BindingContext();
+ // 灏嗘槑缁嗘暟鎹粦瀹氬埌缃戞牸鎺т欢gcMx1锛坓cMx1鏄疓ridControl锛実vMx1鏄叾瀵瑰簲鐨勮鍥撅級
gcMx1.DataSource = dt;
+ // 寮哄埗鍒濆鍖栫綉鏍兼帶浠讹紙纭繚鍒楄缃�佹牱寮忕瓑鐢熸晥锛�
gcMx1.ForceInitialize();
+ // 鑷姩璋冩暣缃戞牸鍒楀锛屼娇鍒楀唴瀹瑰畬鍏ㄦ樉绀猴紙浼樺寲瑙嗚鏁堟灉锛�
gvMx1.BestFitColumns();
-
+ // 璋冪敤宸ュ叿鏂规硶璁剧疆缃戞牸甯冨眬锛堝闄愬埗鏈�澶у垪瀹斤紝閬垮厤鍒楄繃瀹藉鑷寸晫闈㈡贩涔憋級
Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
+ // 鑻ユ槑缁嗘暟鎹笉瀛樺湪锛堟棤璁板綍锛�
else
{
+ // 璋冪敤宸ュ叿鏂规硶璁剧疆榛樿鐨勭綉鏍肩粨鏋勶紙濡傜┖琛ㄦ椂鏄剧ず鍒楁爣棰樹絾鏃犳暟鎹锛�
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
}
+ // 鏈嶅姟绔繑鍥炲け璐ョ姸鎬侊紙rtnCode <= 0锛夛紝鏄剧ず鏈嶅姟绔繑鍥炵殑閿欒娑堟伅
else
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
+ // 鎹曡幏鎵ц杩囩▼涓殑寮傚父锛堝缃戠粶閿欒銆丣SON瑙ｆ瀽澶辫触绛夛級
catch (Exception ex)
{
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ // 鏄剧ず寮傚父淇℃伅锛屼究浜庤皟璇曞拰鐢ㄦ埛鍙嶉
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
/// <summary>
/// 宸ュ叿鏉′簨浠�
/// </summary>
/// <param name="inFieldValue"></param>
/// <summary>
- ///
- /// </summary>
- /// <param name="inFieldValue"></param>
+
private void _toolCk(int _inFieldValue)
{
+ //toolBarMenu1.guidKey = "";
+ //string rowGuid, rowName;
+ //(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ // lbGuid, txt_fBillNo, gridView1, "fBillNo");
+ //toolBarMenu1.guidKey = rowGuid;
+ //if (string.IsNullOrEmpty(rowGuid))
+ //{
+ // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ // return;
+ //}
+ //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎿嶄綔鍚楋紵"))
+ // return;
+ //var frm = new MesQcExceptionalShow(rowGuid);
+ //frm.UpdateParent += (s, e) =>
+ //{
+ // int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ // gridView1.FocusedRowHandle = rowHandle;
+ // UtilityHelper.SetCheckIco(gridView1, "chkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
+ //};
+ //frm.ShowDialog();
+ //return;
string strMsg = "";
switch (_inFieldValue)
{
@@ -276,13 +520,12 @@
};
try
{
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "EditModelSubmit",
- JsonConvert.SerializeObject(_obj));
+ var strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
- MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -291,13 +534,14 @@
gridView1.FocusedRowHandle = rowHandle;
UtilityHelper.SetCheckIco(gridView1, "chkStatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
- else
- MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx
index 5160e8b..9f852af 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.resx
@@ -120,4 +120,7 @@
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <metadata name="behaviorManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>93, 17</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 74e30c4..5f90786 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -107,7 +107,13 @@
<Reference Include="DevExpress.XtraTreeMap.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="FastReport">
- <HintPath>D:\GsMesV2\DevApp\Gs.DevApp\bin\Debug\FastReport.dll</HintPath>
+ <HintPath>..\..\..\..\FastReport.dll</HintPath>
+ </Reference>
+ <Reference Include="FastReport.Bars">
+ <HintPath>..\..\..\..\FastReport.Bars.dll</HintPath>
+ </Reference>
+ <Reference Include="FastReport.Editor">
+ <HintPath>..\..\..\..\FastReport.Editor.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
diff --git a/DevApp/Gs.DevApp/Properties/licenses.licx b/DevApp/Gs.DevApp/Properties/licenses.licx
index 92a620f..e4832f6 100644
--- a/DevApp/Gs.DevApp/Properties/licenses.licx
+++ b/DevApp/Gs.DevApp/Properties/licenses.licx
@@ -1,25 +1,26 @@
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--
Gitblit v1.9.3