From cd47f11ebfaadb81d6efcf778542d3b44acee5a2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 03 九月 2025 17:27:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 192946b..50bd956 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -73,6 +73,7 @@
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -300,7 +301,8 @@
this.gridColumn5,
this.gv_remark,
this.gridColumn4,
- this.gridColumn11});
+ this.gridColumn11,
+ this.gridColumn7});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -341,7 +343,7 @@
//
this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
this.gv_urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
- this.gv_urgentFlag.FieldName = "urgentFlag";
+ this.gv_urgentFlag.FieldName = "urgentFlagTxt";
this.gv_urgentFlag.Name = "gv_urgentFlag";
this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
this.gv_urgentFlag.Tag = "query_a.urgent_flag";
@@ -474,6 +476,16 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Width = 94;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "SRM鍒拌揣鍗曞彿";
+ this.gridColumn7.FieldName = "paperBillNo";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 13;
+ this.gridColumn7.Width = 94;
//
// pageBar1
//
@@ -1063,11 +1075,11 @@
this.gvMx1urgentFlag.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gvMx1urgentFlag.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1urgentFlag.Caption = "鎬ユ枡";
- this.gvMx1urgentFlag.FieldName = "urgentFlag";
+ this.gvMx1urgentFlag.FieldName = "urgentFlagTxt";
this.gvMx1urgentFlag.MinWidth = 25;
this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
- this.gvMx1urgentFlag.Tag = "edit";
- this.gvMx1urgentFlag.UnboundDataType = typeof(bool);
+ this.gvMx1urgentFlag.Tag = "";
+ this.gvMx1urgentFlag.UnboundDataType = typeof(string);
this.gvMx1urgentFlag.Visible = true;
this.gvMx1urgentFlag.VisibleIndex = 1;
this.gvMx1urgentFlag.Width = 34;
@@ -1169,7 +1181,7 @@
this.gvMx1subQty.OptionsColumn.ReadOnly = true;
this.gvMx1subQty.Tag = "query_a.sub_qty";
this.gvMx1subQty.Visible = true;
- this.gvMx1subQty.VisibleIndex = 11;
+ this.gvMx1subQty.VisibleIndex = 8;
this.gvMx1subQty.Width = 64;
//
// gvMx1quantity
@@ -1185,7 +1197,7 @@
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "yz_quantity_0_edit";
this.gvMx1quantity.Visible = true;
- this.gvMx1quantity.VisibleIndex = 12;
+ this.gvMx1quantity.VisibleIndex = 9;
this.gvMx1quantity.Width = 64;
//
// gvMx1memo
@@ -1202,7 +1214,7 @@
this.gvMx1memo.OptionsColumn.ReadOnly = true;
this.gvMx1memo.Tag = "edit";
this.gvMx1memo.Visible = true;
- this.gvMx1memo.VisibleIndex = 13;
+ this.gvMx1memo.VisibleIndex = 10;
this.gvMx1memo.Width = 110;
//
// gvMx1okRkqty
@@ -1215,7 +1227,7 @@
this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
this.gvMx1okRkqty.Visible = true;
- this.gvMx1okRkqty.VisibleIndex = 8;
+ this.gvMx1okRkqty.VisibleIndex = 11;
this.gvMx1okRkqty.Width = 64;
//
// gvMx1checkDate
@@ -1402,17 +1414,17 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 9;
+ this.gridColumn19.VisibleIndex = 12;
this.gridColumn19.Width = 94;
//
// gridColumn20
//
- this.gridColumn20.Caption = "绱Н浠撻��";
+ this.gridColumn20.Caption = "绱浠撻��";
this.gridColumn20.FieldName = "ljct";
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 10;
+ this.gridColumn20.VisibleIndex = 13;
this.gridColumn20.Width = 94;
//
// picCheckBox
@@ -1597,5 +1609,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
}
}
\ No newline at end of file
--
Gitblit v1.9.3