From c828cad54fbd4c3b812e7b2e01590688f26b28de Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 06 六月 2025 10:31:42 +0800
Subject: [PATCH] 委外
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 3
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs | 36 +++---
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs | 10
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs | 212 ++++++++++++----------------------
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 3
DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.Designer.cs | 12 +
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs | 2
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 41 ++++++
9 files changed, 153 insertions(+), 170 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index f130d2b..f77fd81 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -29,8 +29,8 @@
</runtime>
<appSettings>
<!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 7fa578c..f27b4e3 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -31,7 +31,7 @@
toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick;
this.toolBarMenu1.getXmlConfig();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fsubmitTxt", "", (value) =>
@@ -543,6 +543,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
ucUpFileList1.pGuid = lbGuid.Text.Trim();
if (guid5.Length > 10)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 48fb1fd..cb731d4 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -63,7 +63,7 @@
};
this.toolBarMenu1.getXmlConfig();
Form parentForm = this.FindForm();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "foneChecked", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -495,6 +495,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.Designer.cs
index 5b50155..56f2cf3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.Designer.cs
@@ -135,6 +135,8 @@
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Tag = "query_a.PURCHASE_QTY";
+ this.gridColumn22.Visible = true;
+ this.gridColumn22.VisibleIndex = 5;
this.gridColumn22.Width = 25;
//
// gridColumn47
@@ -144,7 +146,7 @@
this.gridColumn47.MinWidth = 25;
this.gridColumn47.Name = "gridColumn47";
this.gridColumn47.Visible = true;
- this.gridColumn47.VisibleIndex = 7;
+ this.gridColumn47.VisibleIndex = 8;
this.gridColumn47.Width = 43;
//
// gridColumn48
@@ -154,7 +156,7 @@
this.gridColumn48.MinWidth = 25;
this.gridColumn48.Name = "gridColumn48";
this.gridColumn48.Visible = true;
- this.gridColumn48.VisibleIndex = 6;
+ this.gridColumn48.VisibleIndex = 7;
this.gridColumn48.Width = 94;
//
// gridColumn12
@@ -178,7 +180,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 5;
+ this.gridColumn18.VisibleIndex = 6;
this.gridColumn18.Width = 94;
//
// gridColumn1
@@ -191,7 +193,7 @@
this.gridColumn1.VisibleIndex = 1;
this.gridColumn1.Width = 94;
//
- // historyDhmxcs
+ // HistoryDhmxcs
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -200,7 +202,7 @@
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
this.MinimizeBox = false;
- this.Name = "historyDhmxcs";
+ this.Name = "HistoryDhmxcs";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "鏀舵枡鏄庣粏";
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
index 300d157..9618fa2 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
@@ -438,7 +438,7 @@
this.gv_businessStatus.OptionsColumn.AllowEdit = false;
this.gv_businessStatus.Tag = "query_a.BUSINESS_STATUS";
this.gv_businessStatus.Visible = true;
- this.gv_businessStatus.VisibleIndex = 1;
+ this.gv_businessStatus.VisibleIndex = 2;
this.gv_businessStatus.Width = 50;
//
// gridColumn3
@@ -448,7 +448,7 @@
this.gridColumn3.MinWidth = 10;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.VisibleIndex = 3;
this.gridColumn3.Width = 100;
//
// gridColumn2
@@ -458,7 +458,7 @@
this.gridColumn2.MinWidth = 10;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 3;
+ this.gridColumn2.VisibleIndex = 4;
this.gridColumn2.Width = 150;
//
// gridColumn1
@@ -468,7 +468,7 @@
this.gridColumn1.MinWidth = 10;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.VisibleIndex = 5;
this.gridColumn1.Width = 150;
//
// gv_erpProductionOrderNo
@@ -481,7 +481,7 @@
this.gv_erpProductionOrderNo.OptionsColumn.AllowEdit = false;
this.gv_erpProductionOrderNo.Tag = "query_a.ERP_PRODUCTION_ORDER_NO";
this.gv_erpProductionOrderNo.Visible = true;
- this.gv_erpProductionOrderNo.VisibleIndex = 5;
+ this.gv_erpProductionOrderNo.VisibleIndex = 1;
this.gv_erpProductionOrderNo.Width = 94;
//
// gv_orderType
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
index 3aab655..6cd1249 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
@@ -45,6 +45,7 @@
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa001 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -85,13 +86,11 @@
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.txt_daa008 = new DevExpress.XtraEditors.TextEdit();
this.txt_mesEndProd = new DevExpress.XtraEditors.TextEdit();
- this.txt_wrkQty = new DevExpress.XtraEditors.TextEdit();
this.txt_dwName = new DevExpress.XtraEditors.TextEdit();
this.txt_cgd = new DevExpress.XtraEditors.TextEdit();
this.txt_cgdxh = new DevExpress.XtraEditors.TextEdit();
this.txt_erpProductionOrderNo = new DevExpress.XtraEditors.TextEdit();
this.txt_pcHNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_yrkQty = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -104,13 +103,8 @@
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -133,7 +127,9 @@
this.gvMx1dab012 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab002 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -164,13 +160,11 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_wrkQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cgd.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cgdxh.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpProductionOrderNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_pcHNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_yrkQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -183,19 +177,17 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -304,6 +296,14 @@
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "涓婚敭Guid";
+ this.gridColumn13.FieldName = "guid";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Width = 94;
//
// gv_daa001
//
@@ -615,7 +615,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 157;
+ this.splitMx1.SplitterPosition = 154;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -632,13 +632,11 @@
this.layoutMx1.Controls.Add(this.txt_itemNo);
this.layoutMx1.Controls.Add(this.txt_daa008);
this.layoutMx1.Controls.Add(this.txt_mesEndProd);
- this.layoutMx1.Controls.Add(this.txt_wrkQty);
this.layoutMx1.Controls.Add(this.txt_dwName);
this.layoutMx1.Controls.Add(this.txt_cgd);
this.layoutMx1.Controls.Add(this.txt_cgdxh);
this.layoutMx1.Controls.Add(this.txt_erpProductionOrderNo);
this.layoutMx1.Controls.Add(this.txt_pcHNo);
- this.layoutMx1.Controls.Add(this.txt_yrkQty);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem16});
@@ -646,7 +644,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 157);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 154);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -661,7 +659,7 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(111, 124);
+ this.txt_remark.Location = new System.Drawing.Point(111, 121);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
this.txt_remark.Properties.ReadOnly = true;
@@ -671,7 +669,7 @@
//
// txt_daa001
//
- this.txt_daa001.Location = new System.Drawing.Point(111, 12);
+ this.txt_daa001.Location = new System.Drawing.Point(111, 9);
this.txt_daa001.Name = "txt_daa001";
this.txt_daa001.Properties.Appearance.Options.UseFont = true;
this.txt_daa001.Properties.ReadOnly = true;
@@ -681,7 +679,7 @@
//
// txt_wgTime
//
- this.txt_wgTime.Location = new System.Drawing.Point(653, 68);
+ this.txt_wgTime.Location = new System.Drawing.Point(653, 65);
this.txt_wgTime.Name = "txt_wgTime";
this.txt_wgTime.Properties.Appearance.Options.UseFont = true;
this.txt_wgTime.Properties.ReadOnly = true;
@@ -691,7 +689,7 @@
//
// txt_wgUser
//
- this.txt_wgUser.Location = new System.Drawing.Point(653, 40);
+ this.txt_wgUser.Location = new System.Drawing.Point(653, 37);
this.txt_wgUser.Name = "txt_wgUser";
this.txt_wgUser.Properties.Appearance.Options.UseFont = true;
this.txt_wgUser.Properties.ReadOnly = true;
@@ -701,7 +699,7 @@
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(382, 12);
+ this.txt_daa014.Location = new System.Drawing.Point(382, 9);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Properties.Appearance.Options.UseFont = true;
this.txt_daa014.Properties.ReadOnly = true;
@@ -711,7 +709,7 @@
//
// txt_daa018
//
- this.txt_daa018.Location = new System.Drawing.Point(653, 12);
+ this.txt_daa018.Location = new System.Drawing.Point(653, 9);
this.txt_daa018.Name = "txt_daa018";
this.txt_daa018.Properties.Appearance.Options.UseFont = true;
this.txt_daa018.Properties.ReadOnly = true;
@@ -721,7 +719,7 @@
//
// txt_mesStartProd
//
- this.txt_mesStartProd.Location = new System.Drawing.Point(924, 12);
+ this.txt_mesStartProd.Location = new System.Drawing.Point(924, 9);
this.txt_mesStartProd.Name = "txt_mesStartProd";
this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
this.txt_mesStartProd.Properties.ReadOnly = true;
@@ -731,7 +729,7 @@
//
// txt_blStateTxt
//
- this.txt_blStateTxt.Location = new System.Drawing.Point(924, 68);
+ this.txt_blStateTxt.Location = new System.Drawing.Point(924, 65);
this.txt_blStateTxt.Name = "txt_blStateTxt";
this.txt_blStateTxt.Properties.Appearance.Options.UseFont = true;
this.txt_blStateTxt.Properties.ReadOnly = true;
@@ -741,7 +739,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(111, 40);
+ this.txt_itemNo.Location = new System.Drawing.Point(111, 37);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Properties.ReadOnly = true;
@@ -751,7 +749,7 @@
//
// txt_daa008
//
- this.txt_daa008.Location = new System.Drawing.Point(382, 40);
+ this.txt_daa008.Location = new System.Drawing.Point(382, 37);
this.txt_daa008.Name = "txt_daa008";
this.txt_daa008.Properties.Appearance.Options.UseFont = true;
this.txt_daa008.Properties.ReadOnly = true;
@@ -761,7 +759,7 @@
//
// txt_mesEndProd
//
- this.txt_mesEndProd.Location = new System.Drawing.Point(924, 40);
+ this.txt_mesEndProd.Location = new System.Drawing.Point(924, 37);
this.txt_mesEndProd.Name = "txt_mesEndProd";
this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
this.txt_mesEndProd.Properties.ReadOnly = true;
@@ -769,19 +767,9 @@
this.txt_mesEndProd.StyleController = this.layoutMx1;
this.txt_mesEndProd.TabIndex = 235;
//
- // txt_wrkQty
- //
- this.txt_wrkQty.Location = new System.Drawing.Point(382, 68);
- this.txt_wrkQty.Name = "txt_wrkQty";
- this.txt_wrkQty.Properties.Appearance.Options.UseFont = true;
- this.txt_wrkQty.Properties.ReadOnly = true;
- this.txt_wrkQty.Size = new System.Drawing.Size(168, 24);
- this.txt_wrkQty.StyleController = this.layoutMx1;
- this.txt_wrkQty.TabIndex = 228;
- //
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(653, 96);
+ this.txt_dwName.Location = new System.Drawing.Point(382, 65);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
this.txt_dwName.Properties.ReadOnly = true;
@@ -791,7 +779,7 @@
//
// txt_cgd
//
- this.txt_cgd.Location = new System.Drawing.Point(111, 68);
+ this.txt_cgd.Location = new System.Drawing.Point(111, 65);
this.txt_cgd.Name = "txt_cgd";
this.txt_cgd.Size = new System.Drawing.Size(168, 24);
this.txt_cgd.StyleController = this.layoutMx1;
@@ -799,7 +787,7 @@
//
// txt_cgdxh
//
- this.txt_cgdxh.Location = new System.Drawing.Point(111, 96);
+ this.txt_cgdxh.Location = new System.Drawing.Point(111, 93);
this.txt_cgdxh.Name = "txt_cgdxh";
this.txt_cgdxh.Size = new System.Drawing.Size(168, 24);
this.txt_cgdxh.StyleController = this.layoutMx1;
@@ -807,7 +795,7 @@
//
// txt_erpProductionOrderNo
//
- this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(653, 124);
+ this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(382, 93);
this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(168, 24);
this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
@@ -815,19 +803,11 @@
//
// txt_pcHNo
//
- this.txt_pcHNo.Location = new System.Drawing.Point(924, 96);
+ this.txt_pcHNo.Location = new System.Drawing.Point(653, 93);
this.txt_pcHNo.Name = "txt_pcHNo";
- this.txt_pcHNo.Size = new System.Drawing.Size(169, 24);
+ this.txt_pcHNo.Size = new System.Drawing.Size(168, 24);
this.txt_pcHNo.StyleController = this.layoutMx1;
this.txt_pcHNo.TabIndex = 316;
- //
- // txt_yrkQty
- //
- this.txt_yrkQty.Location = new System.Drawing.Point(382, 96);
- this.txt_yrkQty.Name = "txt_yrkQty";
- this.txt_yrkQty.Size = new System.Drawing.Size(168, 24);
- this.txt_yrkQty.StyleController = this.layoutMx1;
- this.txt_yrkQty.TabIndex = 317;
//
// layoutControlItem16
//
@@ -856,14 +836,12 @@
this.layoutControlItem8,
this.layoutControlItem11,
this.layoutControlItem12,
- this.layoutControlItem9,
- this.layoutControlItem21,
this.layoutControlItem17,
this.layoutControlItem18,
- this.layoutControlItem20,
+ this.layoutControlItem13,
this.layoutControlItem10,
this.layoutControlItem19,
- this.layoutControlItem13});
+ this.layoutControlItem20});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1005,28 +983,6 @@
this.layoutControlItem12.Text = "閫氱煡澶囨枡";
this.layoutControlItem12.TextSize = new System.Drawing.Size(87, 18);
//
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_wrkQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(271, 56);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 28);
- this.layoutControlItem9.Text = "鏈叆搴撴暟";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem21
- //
- this.layoutControlItem21.Control = this.txt_yrkQty;
- this.layoutControlItem21.Location = new System.Drawing.Point(271, 84);
- this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem21.Size = new System.Drawing.Size(271, 28);
- this.layoutControlItem21.Text = "宸插叆搴撴暟";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(87, 18);
- //
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_cgd;
@@ -1047,39 +1003,6 @@
this.layoutControlItem18.Text = "閲囪喘鍗曡鍙�";
this.layoutControlItem18.TextSize = new System.Drawing.Size(87, 18);
//
- // layoutControlItem20
- //
- this.layoutControlItem20.Control = this.txt_pcHNo;
- this.layoutControlItem20.Location = new System.Drawing.Point(813, 84);
- this.layoutControlItem20.Name = "layoutControlItem20";
- this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(272, 28);
- this.layoutControlItem20.Text = "鎺掍骇缂栧彿";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_dwName;
- this.layoutControlItem10.Location = new System.Drawing.Point(542, 84);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(271, 28);
- this.layoutControlItem10.Text = "鍗曚綅";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.txt_erpProductionOrderNo;
- this.layoutControlItem19.Location = new System.Drawing.Point(542, 112);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem19.Size = new System.Drawing.Size(271, 28);
- this.layoutControlItem19.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(87, 18);
- //
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_remark;
@@ -1097,7 +1020,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 401);
+ this.tabMx.Size = new System.Drawing.Size(1126, 404);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1106,7 +1029,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 369);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 372);
this.tabMxPage1.Text = "澶囨枡鍗曡韩";
//
// gcMx1
@@ -1115,7 +1038,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 369);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 372);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1323,13 +1246,38 @@
this.gvMx1dab002.VisibleIndex = 9;
this.gvMx1dab002.Width = 50;
//
- // gridColumn13
+ // layoutControlItem10
//
- this.gridColumn13.Caption = "涓婚敭Guid";
- this.gridColumn13.FieldName = "guid";
- this.gridColumn13.MinWidth = 25;
- this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.Width = 94;
+ this.layoutControlItem10.Control = this.txt_dwName;
+ this.layoutControlItem10.Location = new System.Drawing.Point(271, 56);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem10.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem10.Text = "鍗曚綅";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_erpProductionOrderNo;
+ this.layoutControlItem19.Location = new System.Drawing.Point(271, 84);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem19.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem19.Text = "浠诲姟鍗曞彿";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(87, 18);
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_pcHNo;
+ this.layoutControlItem20.Location = new System.Drawing.Point(542, 84);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem20.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem20.Text = "鎺掍骇缂栧彿";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(87, 18);
//
// Frm_WwGd
//
@@ -1370,13 +1318,11 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_wrkQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cgd.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cgdxh.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpProductionOrderNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_pcHNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_yrkQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -1389,19 +1335,17 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
this.ResumeLayout(false);
}
@@ -1442,7 +1386,6 @@
private DevExpress.XtraEditors.TextEdit txt_blStateTxt;
private DevExpress.XtraEditors.TextEdit txt_mesEndProd;
private DevExpress.XtraEditors.TextEdit txt_mesStartProd;
- private DevExpress.XtraEditors.TextEdit txt_wrkQty;
private DevExpress.XtraEditors.TextEdit txt_daa014;
private DevExpress.XtraEditors.TextEdit txt_dwName;
private DevExpress.XtraEditors.TextEdit txt_daa008;
@@ -1489,17 +1432,14 @@
private DevExpress.XtraEditors.TextEdit txt_erpProductionOrderNo;
private DevExpress.XtraEditors.TextEdit txt_pcHNo;
private DevExpress.Utils.ToolTipController tips;
- private DevExpress.XtraEditors.TextEdit txt_yrkQty;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
index e7ef4bc..b93c9aa 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
@@ -275,7 +275,7 @@
private void getPageList(int curPage)
{
gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
index 88a6103..55a596b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
@@ -392,37 +392,37 @@
this.txt_hNo.Location = new System.Drawing.Point(84, 12);
this.txt_hNo.Name = "txt_hNo";
this.txt_hNo.Properties.Appearance.Options.UseFont = true;
- this.txt_hNo.Size = new System.Drawing.Size(200, 24);
+ this.txt_hNo.Size = new System.Drawing.Size(195, 24);
this.txt_hNo.StyleController = this.layoutMx1;
this.txt_hNo.TabIndex = 211;
this.txt_hNo.Tag = "readonly";
//
// txt_shBy
//
- this.txt_shBy.Location = new System.Drawing.Point(360, 12);
+ this.txt_shBy.Location = new System.Drawing.Point(355, 12);
this.txt_shBy.Name = "txt_shBy";
this.txt_shBy.Properties.Appearance.Options.UseFont = true;
- this.txt_shBy.Size = new System.Drawing.Size(200, 24);
+ this.txt_shBy.Size = new System.Drawing.Size(195, 24);
this.txt_shBy.StyleController = this.layoutMx1;
this.txt_shBy.TabIndex = 217;
this.txt_shBy.Tag = "readonly";
//
// txt_shTime
//
- this.txt_shTime.Location = new System.Drawing.Point(636, 12);
+ this.txt_shTime.Location = new System.Drawing.Point(626, 12);
this.txt_shTime.Name = "txt_shTime";
this.txt_shTime.Properties.Appearance.Options.UseFont = true;
- this.txt_shTime.Size = new System.Drawing.Size(200, 24);
+ this.txt_shTime.Size = new System.Drawing.Size(195, 24);
this.txt_shTime.StyleController = this.layoutMx1;
this.txt_shTime.TabIndex = 219;
this.txt_shTime.Tag = "readonly";
//
// txt_shState
//
- this.txt_shState.Location = new System.Drawing.Point(840, 12);
+ this.txt_shState.Location = new System.Drawing.Point(825, 12);
this.txt_shState.Name = "txt_shState";
this.txt_shState.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_shState.Size = new System.Drawing.Size(274, 24);
+ this.txt_shState.Size = new System.Drawing.Size(268, 24);
this.txt_shState.StyleController = this.layoutMx1;
this.txt_shState.TabIndex = 220;
this.txt_shState.Tag = "readonly";
@@ -471,7 +471,7 @@
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2});
- this.Root.Size = new System.Drawing.Size(1126, 82);
+ this.Root.Size = new System.Drawing.Size(1105, 82);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -479,37 +479,37 @@
this.layoutControlItem1.Control = this.txt_hNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem1.Text = "鎺掍骇缂栧彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_shBy;
- this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem2.Text = "瀹℃牳浜�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_shTime;
- this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem3.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_shState;
- this.layoutControlItem4.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem4.Text = "瀹℃牳鐘舵��";
this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem4.TextVisible = false;
@@ -522,7 +522,7 @@
this.layoutControlItem5.MinSize = new System.Drawing.Size(135, 31);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem5.Text = "閫夋嫨浠诲姟鍗�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
@@ -755,7 +755,7 @@
this.gvMx1mesStartProd.AppearanceCell.Options.UseForeColor = true;
this.gvMx1mesStartProd.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gvMx1mesStartProd.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1mesStartProd.Caption = "棰勮寮�宸ユ椂闂�";
+ this.gvMx1mesStartProd.Caption = "Mes棰勮寮�宸ユ椂闂�";
this.gvMx1mesStartProd.ColumnEdit = this.repositoryItemDateEdit1;
this.gvMx1mesStartProd.FieldName = "mesStartProd";
this.gvMx1mesStartProd.MinWidth = 180;
@@ -781,7 +781,7 @@
this.gvMx1mesEndProd.AppearanceCell.Options.UseForeColor = true;
this.gvMx1mesEndProd.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gvMx1mesEndProd.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1mesEndProd.Caption = "棰勮瀹屽伐鏃堕棿";
+ this.gvMx1mesEndProd.Caption = "Mes棰勮瀹屽伐鏃堕棿";
this.gvMx1mesEndProd.ColumnEdit = this.repositoryItemDateEdit2;
this.gvMx1mesEndProd.FieldName = "mesEndProd";
this.gvMx1mesEndProd.MinWidth = 180;
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index e0885ab..3ab1971 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1952,7 +1952,7 @@
/// <param name="fm"></param>
/// <param name="fileName"></param>
/// <param name="icoName"></param>
- public static void SetGridViewParameterMx(GridView gridView1)
+ public static void SetGridViewParameterMx(GridView gridView1, DevExpress.Utils.ToolTipController tips = null)
{
gridView1.PopupMenuShowing += (s, e) =>
{
@@ -2023,6 +2023,45 @@
}
}
};
+
+ if (tips != null)
+ {
+ tips.Appearance.BackColor = Color.LightBlue; // 璁剧疆鑳屾櫙棰滆壊
+ tips.Appearance.ForeColor = Color.Black; // 璁剧疆鍓嶆櫙鑹诧紙鏂囧瓧棰滆壊锛�
+ gridView1.MouseMove += (s, e) =>
+ {
+ try
+ {
+ GridHitInfo hi = gridView1.CalcHitInfo(new Point(e.X, e.Y));
+ if (hi.InRowCell)
+ {
+ int cuRowHandle = hi.RowHandle;
+ if (cuRowHandle < 0)
+ return;
+ DataRow curRow = gridView1.GetDataRow(cuRowHandle);
+ var column = hi.Column;
+ string showTxt = curRow[column.FieldName].ToString();
+ ToolTipControllerShowEventArgs aa = new ToolTipControllerShowEventArgs();
+ aa.AllowHtmlText = DefaultBoolean.True;
+ aa.Title = column.Caption; //HTML, 绮椾綋
+ aa.ToolTip = showTxt; //鏂
+ aa.ShowBeak = true;
+ aa.Rounded = true; ////鍦嗚
+ aa.RoundRadius = 7; //鍦嗚鐜�
+ // aa.ToolTipType = ToolTipType.SuperTip; //瓒呯骇鏍峰紡锛屽彲澶氳鎴栨樉绀哄浘鏍�
+ aa.ToolTipType = ToolTipType.Standard;//鏍囧噯鏍峰紡锛屽彲鏄剧ず楦熷槾銆�
+ aa.IconType = ToolTipIconType.Information; //娑堟伅鍥炬爣
+ aa.IconSize = ToolTipIconSize.Small; //澶у浘鏍�
+ tips.ShowHint(aa);
+ }
+ else
+ tips.HideHint();
+ }
+ catch (Exception exception)
+ {
+ }
+ };
+ }
}
#endregion
--
Gitblit v1.9.3