From b7d9f2e23cbda587d814c7d07c1664c053c83dcb Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 12 八月 2025 13:58:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
index eacaeb1..af362ec 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -119,6 +119,7 @@
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptStation = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -321,8 +322,6 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.AllowEdit = false;
this.gridColumn7.Tag = "query_a.ITEM_ID";
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 1;
this.gridColumn7.Width = 94;
//
// gv_itemNo
@@ -335,7 +334,7 @@
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_b.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 2;
+ this.gv_itemNo.VisibleIndex = 1;
this.gv_itemNo.Width = 150;
//
// gridColumn3
@@ -347,7 +346,7 @@
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Tag = "query_b.item_name";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.VisibleIndex = 2;
this.gridColumn3.Width = 250;
//
// gridColumn2
@@ -360,7 +359,7 @@
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Tag = "query_b.item_model";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 4;
+ this.gridColumn2.VisibleIndex = 3;
this.gridColumn2.Width = 100;
//
// gv_foneCheckor
@@ -373,7 +372,7 @@
this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
this.gv_foneCheckor.Visible = true;
- this.gv_foneCheckor.VisibleIndex = 5;
+ this.gv_foneCheckor.VisibleIndex = 4;
this.gv_foneCheckor.Width = 94;
//
// gv_foneCheckdate
@@ -386,7 +385,7 @@
this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
this.gv_foneCheckdate.Visible = true;
- this.gv_foneCheckdate.VisibleIndex = 6;
+ this.gv_foneCheckdate.VisibleIndex = 5;
this.gv_foneCheckdate.Width = 120;
//
// gridColumn1
@@ -398,7 +397,7 @@
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Tag = "query_a.CREATE_BY";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 7;
+ this.gridColumn1.VisibleIndex = 6;
this.gridColumn1.Width = 94;
//
// gridColumn4
@@ -410,7 +409,7 @@
this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.Tag = "query_a.CREATE_DATE";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 8;
+ this.gridColumn4.VisibleIndex = 7;
this.gridColumn4.Width = 180;
//
// gv_memo
@@ -423,7 +422,7 @@
this.gv_memo.OptionsColumn.AllowEdit = false;
this.gv_memo.Tag = "query_a.MEMO";
this.gv_memo.Visible = true;
- this.gv_memo.VisibleIndex = 9;
+ this.gv_memo.VisibleIndex = 8;
this.gv_memo.Width = 150;
//
// gridColumn16
@@ -443,7 +442,7 @@
this.gridColumn8.OptionsColumn.AllowEdit = false;
this.gridColumn8.Tag = "org.fnumber";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 10;
+ this.gridColumn8.VisibleIndex = 9;
this.gridColumn8.Width = 250;
//
// gridColumn18
@@ -453,7 +452,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 11;
+ this.gridColumn18.VisibleIndex = 10;
this.gridColumn18.Width = 94;
//
// pageBar1
@@ -893,6 +892,7 @@
this.gvMx1fdownAllow,
this.gridColumn19,
this.gvMxDel,
+ this.gridColumn11,
this.gridColumn6,
this.gridColumn9,
this.gridColumn10});
@@ -909,6 +909,7 @@
this.gvMx1guid.Caption = "瀛愯〃涓婚敭GUID";
this.gvMx1guid.FieldName = "guid";
this.gvMx1guid.Name = "gvMx1guid";
+ this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
this.gvMx1guid.Width = 94;
//
@@ -918,6 +919,7 @@
this.gvMx1pid.Caption = "涓昏〃涓婚敭GUID";
this.gvMx1pid.FieldName = "pid";
this.gvMx1pid.Name = "gvMx1pid";
+ this.gvMx1pid.OptionsColumn.ReadOnly = true;
this.gvMx1pid.Tag = "query_a.pid";
this.gvMx1pid.Width = 94;
//
@@ -930,7 +932,7 @@
this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
this.gvMx1fcheckItem.Tag = "edit";
this.gvMx1fcheckItem.Visible = true;
- this.gvMx1fcheckItem.VisibleIndex = 0;
+ this.gvMx1fcheckItem.VisibleIndex = 1;
this.gvMx1fcheckItem.Width = 150;
//
// rptJYXM
@@ -949,7 +951,7 @@
this.gvMx1forder.Name = "gvMx1forder";
this.gvMx1forder.Tag = "yz_quantity_0_edit";
this.gvMx1forder.Visible = true;
- this.gvMx1forder.VisibleIndex = 1;
+ this.gvMx1forder.VisibleIndex = 0;
this.gvMx1forder.Width = 50;
//
// rptShunXui
@@ -1133,7 +1135,7 @@
this.gvMxDel.MinWidth = 50;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 14;
+ this.gvMxDel.VisibleIndex = 13;
this.gvMxDel.Width = 100;
//
// repositoryItemButtonEdit1
@@ -1146,6 +1148,15 @@
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "鍗曚綅";
+ this.gridColumn11.FieldName = "funit";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Tag = "edit";
+ this.gridColumn11.Width = 94;
//
// gridColumn6
//
@@ -1176,8 +1187,6 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Tag = "edit";
this.gridColumn9.UnboundDataType = typeof(bool);
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 12;
this.gridColumn9.Width = 94;
//
// repositoryItemCheckEdit1
@@ -1194,7 +1203,7 @@
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Tag = "edit";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 13;
+ this.gridColumn10.VisibleIndex = 12;
this.gridColumn10.Width = 94;
//
// rptGroup
@@ -1374,5 +1383,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptGroup;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
}
}
\ No newline at end of file
--
Gitblit v1.9.3