From e5414022999d94626b0d55d29d0dba3ce700fea9 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 22 九月 2025 15:40:13 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/UserControl/ShowLogcs.cs | 5 ++
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs | 44 +++++++++++----------
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs | 56 ++++++++++++++-------------
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 1
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.cs | 2 +
5 files changed, 60 insertions(+), 48 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
index 7f9f1e1..bc9185c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
@@ -328,20 +328,22 @@
this.gv_bl018.Tag = "query_a.bl018";
this.gv_bl018.UnboundDataType = typeof(bool);
this.gv_bl018.Visible = true;
- this.gv_bl018.VisibleIndex = 0;
+ this.gv_bl018.VisibleIndex = 1;
this.gv_bl018.Width = 50;
//
// gv_bl019
//
this.gv_bl019.AppearanceCell.Options.UseFont = true;
this.gv_bl019.Caption = "瀹岀粨鏍囪瘑 ";
- this.gv_bl019.FieldName = "bl019";
+ this.gv_bl019.FieldName = "txtColor";
this.gv_bl019.MaxWidth = 50;
this.gv_bl019.MinWidth = 50;
this.gv_bl019.Name = "gv_bl019";
this.gv_bl019.OptionsColumn.AllowEdit = false;
this.gv_bl019.Tag = "query_a.bl019";
this.gv_bl019.UnboundDataType = typeof(bool);
+ this.gv_bl019.Visible = true;
+ this.gv_bl019.VisibleIndex = 0;
this.gv_bl019.Width = 50;
//
// gv_blNo
@@ -354,7 +356,7 @@
this.gv_blNo.OptionsColumn.AllowEdit = false;
this.gv_blNo.Tag = "query_a.bl_no";
this.gv_blNo.Visible = true;
- this.gv_blNo.VisibleIndex = 1;
+ this.gv_blNo.VisibleIndex = 2;
this.gv_blNo.Width = 100;
//
// gv_bl001
@@ -367,7 +369,7 @@
this.gv_bl001.OptionsColumn.AllowEdit = false;
this.gv_bl001.Tag = "query_a.bl001";
this.gv_bl001.Visible = true;
- this.gv_bl001.VisibleIndex = 2;
+ this.gv_bl001.VisibleIndex = 5;
this.gv_bl001.Width = 100;
//
// gv_bl013
@@ -380,7 +382,7 @@
this.gv_bl013.OptionsColumn.AllowEdit = false;
this.gv_bl013.Tag = "query_a.bl013";
this.gv_bl013.Visible = true;
- this.gv_bl013.VisibleIndex = 3;
+ this.gv_bl013.VisibleIndex = 6;
this.gv_bl013.Width = 94;
//
// gv_bl002
@@ -393,7 +395,7 @@
this.gv_bl002.OptionsColumn.AllowEdit = false;
this.gv_bl002.Tag = "query_a.bl002";
this.gv_bl002.Visible = true;
- this.gv_bl002.VisibleIndex = 4;
+ this.gv_bl002.VisibleIndex = 7;
this.gv_bl002.Width = 94;
//
// gv_bl014
@@ -406,7 +408,7 @@
this.gv_bl014.OptionsColumn.AllowEdit = false;
this.gv_bl014.Tag = "query_a.bl014";
this.gv_bl014.Visible = true;
- this.gv_bl014.VisibleIndex = 5;
+ this.gv_bl014.VisibleIndex = 8;
this.gv_bl014.Width = 94;
//
// gv_bl015
@@ -419,7 +421,7 @@
this.gv_bl015.OptionsColumn.AllowEdit = false;
this.gv_bl015.Tag = "query_a.bl015";
this.gv_bl015.Visible = true;
- this.gv_bl015.VisibleIndex = 6;
+ this.gv_bl015.VisibleIndex = 9;
this.gv_bl015.Width = 94;
//
// gv_bl007
@@ -432,7 +434,7 @@
this.gv_bl007.OptionsColumn.AllowEdit = false;
this.gv_bl007.Tag = "query_a.bl007";
this.gv_bl007.Visible = true;
- this.gv_bl007.VisibleIndex = 7;
+ this.gv_bl007.VisibleIndex = 10;
this.gv_bl007.Width = 94;
//
// gv_bl009
@@ -445,7 +447,7 @@
this.gv_bl009.OptionsColumn.AllowEdit = false;
this.gv_bl009.Tag = "query_a.bl009";
this.gv_bl009.Visible = true;
- this.gv_bl009.VisibleIndex = 8;
+ this.gv_bl009.VisibleIndex = 11;
this.gv_bl009.Width = 94;
//
// gv_bl010
@@ -469,7 +471,7 @@
this.gv_bl011.OptionsColumn.AllowEdit = false;
this.gv_bl011.Tag = "query_a.bl011";
this.gv_bl011.Visible = true;
- this.gv_bl011.VisibleIndex = 9;
+ this.gv_bl011.VisibleIndex = 3;
this.gv_bl011.Width = 94;
//
// gv_bl012
@@ -482,7 +484,7 @@
this.gv_bl012.OptionsColumn.AllowEdit = false;
this.gv_bl012.Tag = "query_a.bl012";
this.gv_bl012.Visible = true;
- this.gv_bl012.VisibleIndex = 10;
+ this.gv_bl012.VisibleIndex = 4;
this.gv_bl012.Width = 94;
//
// gv_bl004
@@ -495,7 +497,7 @@
this.gv_bl004.OptionsColumn.AllowEdit = false;
this.gv_bl004.Tag = "query_a.bl004";
this.gv_bl004.Visible = true;
- this.gv_bl004.VisibleIndex = 11;
+ this.gv_bl004.VisibleIndex = 12;
this.gv_bl004.Width = 94;
//
// gv_bl005
@@ -508,7 +510,7 @@
this.gv_bl005.OptionsColumn.AllowEdit = false;
this.gv_bl005.Tag = "query_a.bl005";
this.gv_bl005.Visible = true;
- this.gv_bl005.VisibleIndex = 12;
+ this.gv_bl005.VisibleIndex = 13;
this.gv_bl005.Width = 94;
//
// gv_bl016
@@ -521,7 +523,7 @@
this.gv_bl016.OptionsColumn.AllowEdit = false;
this.gv_bl016.Tag = "query_a.bl016";
this.gv_bl016.Visible = true;
- this.gv_bl016.VisibleIndex = 13;
+ this.gv_bl016.VisibleIndex = 14;
this.gv_bl016.Width = 94;
//
// gv_bl006
@@ -534,7 +536,7 @@
this.gv_bl006.OptionsColumn.AllowEdit = false;
this.gv_bl006.Tag = "query_a.bl006";
this.gv_bl006.Visible = true;
- this.gv_bl006.VisibleIndex = 14;
+ this.gv_bl006.VisibleIndex = 15;
this.gv_bl006.Width = 94;
//
// gv_wcUser
@@ -547,7 +549,7 @@
this.gv_wcUser.OptionsColumn.AllowEdit = false;
this.gv_wcUser.Tag = "query_a.wc_user";
this.gv_wcUser.Visible = true;
- this.gv_wcUser.VisibleIndex = 15;
+ this.gv_wcUser.VisibleIndex = 16;
this.gv_wcUser.Width = 94;
//
// gv_wcTime
@@ -560,7 +562,7 @@
this.gv_wcTime.OptionsColumn.AllowEdit = false;
this.gv_wcTime.Tag = "query_a.wc_time";
this.gv_wcTime.Visible = true;
- this.gv_wcTime.VisibleIndex = 16;
+ this.gv_wcTime.VisibleIndex = 17;
this.gv_wcTime.Width = 94;
//
// gridColumn9
@@ -571,7 +573,7 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Tag = "org.Fnamber";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 17;
+ this.gridColumn9.VisibleIndex = 18;
this.gridColumn9.Width = 94;
//
// gridColumn12
@@ -581,7 +583,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 18;
+ this.gridColumn12.VisibleIndex = 19;
this.gridColumn12.Width = 94;
//
// gridColumn1
@@ -591,7 +593,7 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 19;
+ this.gridColumn1.VisibleIndex = 20;
this.gridColumn1.Width = 94;
//
// pageBar1
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index f56ce3b..2337ced 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -751,6 +751,7 @@
DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
if (dt.Rows.Count > 0)
{
+ this.xtraTabControl2.SelectedTabPageIndex = 0;
gcMx1.DataSource = null;
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.cs
index 460b67e..cedfb43 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.cs
@@ -27,6 +27,7 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick;
this.toolBarMenu1.getXmlConfig();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
@@ -306,6 +307,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/Warehouse/Frm_MesShouTuo.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
index 02ebeb0..6c6d2e1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
@@ -100,6 +100,7 @@
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -141,7 +142,6 @@
this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -189,6 +189,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -206,7 +207,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -312,15 +312,17 @@
this.gv_qt015.OptionsColumn.AllowEdit = false;
this.gv_qt015.Tag = "query_a.qt015";
this.gv_qt015.Visible = true;
- this.gv_qt015.VisibleIndex = 0;
+ this.gv_qt015.VisibleIndex = 1;
this.gv_qt015.Width = 50;
//
// gridColumn21
//
this.gridColumn21.Caption = "瀹岀粨鏍囪瘑";
- this.gridColumn21.FieldName = "isFinish";
+ this.gridColumn21.FieldName = "txtColor";
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.Visible = true;
+ this.gridColumn21.VisibleIndex = 0;
this.gridColumn21.Width = 94;
//
// gv_qtck
@@ -333,7 +335,7 @@
this.gv_qtck.OptionsColumn.AllowEdit = false;
this.gv_qtck.Tag = "query_a.qtck";
this.gv_qtck.Visible = true;
- this.gv_qtck.VisibleIndex = 2;
+ this.gv_qtck.VisibleIndex = 3;
this.gv_qtck.Width = 180;
//
// gridColumn14
@@ -351,7 +353,7 @@
this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 3;
+ this.gridColumn17.VisibleIndex = 4;
this.gridColumn17.Width = 94;
//
// gridColumn18
@@ -369,7 +371,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 4;
+ this.gridColumn19.VisibleIndex = 5;
this.gridColumn19.Width = 94;
//
// gv_qt005
@@ -382,7 +384,7 @@
this.gv_qt005.OptionsColumn.AllowEdit = false;
this.gv_qt005.Tag = "query_a.qt005";
this.gv_qt005.Visible = true;
- this.gv_qt005.VisibleIndex = 5;
+ this.gv_qt005.VisibleIndex = 6;
this.gv_qt005.Width = 94;
//
// gv_qt001
@@ -395,7 +397,7 @@
this.gv_qt001.OptionsColumn.AllowEdit = false;
this.gv_qt001.Tag = "query_a.qt001";
this.gv_qt001.Visible = true;
- this.gv_qt001.VisibleIndex = 6;
+ this.gv_qt001.VisibleIndex = 7;
this.gv_qt001.Width = 200;
//
// gv_qt016
@@ -408,7 +410,7 @@
this.gv_qt016.OptionsColumn.AllowEdit = false;
this.gv_qt016.Tag = "query_a.qt016";
this.gv_qt016.Visible = true;
- this.gv_qt016.VisibleIndex = 7;
+ this.gv_qt016.VisibleIndex = 8;
this.gv_qt016.Width = 94;
//
// gv_qt002
@@ -421,7 +423,7 @@
this.gv_qt002.OptionsColumn.AllowEdit = false;
this.gv_qt002.Tag = "query_a.qt002";
this.gv_qt002.Visible = true;
- this.gv_qt002.VisibleIndex = 8;
+ this.gv_qt002.VisibleIndex = 9;
this.gv_qt002.Width = 180;
//
// gv_qt010
@@ -434,7 +436,7 @@
this.gv_qt010.OptionsColumn.AllowEdit = false;
this.gv_qt010.Tag = "query_a.qt010";
this.gv_qt010.Visible = true;
- this.gv_qt010.VisibleIndex = 9;
+ this.gv_qt010.VisibleIndex = 10;
this.gv_qt010.Width = 94;
//
// gridColumn13
@@ -444,7 +446,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 10;
+ this.gridColumn13.VisibleIndex = 11;
this.gridColumn13.Width = 94;
//
// gv18
@@ -462,7 +464,7 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 1;
+ this.gridColumn23.VisibleIndex = 2;
this.gridColumn23.Width = 94;
//
// pageBar1
@@ -893,6 +895,18 @@
this.layoutControlItem16.Size = new System.Drawing.Size(287, 28);
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_isFinish;
+ this.layoutControlItem3.Location = new System.Drawing.Point(573, 84);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem3.Size = new System.Drawing.Size(287, 30);
+ this.layoutControlItem3.Text = "瀹岀粨鏍囪瘑";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem3.TextVisible = false;
//
// tabMx
//
@@ -1377,18 +1391,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_isFinish;
- this.layoutControlItem3.Location = new System.Drawing.Point(573, 84);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem3.Size = new System.Drawing.Size(287, 30);
- this.layoutControlItem3.Text = "瀹岀粨鏍囪瘑";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem3.TextVisible = false;
- //
// Frm_MesShouTuo
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1446,6 +1448,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1463,7 +1466,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
index f22815e..72aa9a3 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
@@ -51,6 +51,11 @@
{
var _sbSqlWhere = new StringBuilder();
_sbSqlWhere.Append(" and ABT_GUID='" + this.guidKey + "'");
+ //濡傛灉鏄棩蹇楃被锛屼粎浠呮樉绀烘棩蹇�
+ if (isLog == true)
+ {
+ _sbSqlWhere.Append(" and isnull(IS_ERP,0)=1");
+ }
var pgq = new PageQueryModel(curPage, 999999, "OPERATION_TIME",
"desc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
--
Gitblit v1.9.3