From cbb5315301b1490b57497212256c5255e5eb7eb6 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 01 十一月 2025 17:06:58 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
index 699fc8f..2507632 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
@@ -50,6 +50,9 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.panelControl3)).BeginInit();
@@ -125,7 +128,10 @@
this.gridColumn2,
this.gridColumn1,
this.gridColumn8,
- this.gridColumn11});
+ this.gridColumn11,
+ this.gridColumn12,
+ this.gridColumn13,
+ this.gridColumn14});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -165,7 +171,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 10;
+ this.gridColumn3.VisibleIndex = 11;
this.gridColumn3.Width = 50;
//
// gridColumn4
@@ -189,7 +195,7 @@
this.gv_billNo.OptionsColumn.ReadOnly = true;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 9;
+ this.gv_billNo.VisibleIndex = 10;
this.gv_billNo.Width = 110;
//
// gv_supplierItemCode
@@ -283,7 +289,7 @@
this.gridColumn10.FieldName = "gysName";
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 8;
+ this.gridColumn10.VisibleIndex = 9;
this.gridColumn10.Width = 125;
//
// gridColumn2
@@ -292,7 +298,7 @@
this.gridColumn2.FieldName = "receivingOrg";
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 11;
+ this.gridColumn2.VisibleIndex = 12;
this.gridColumn2.Width = 250;
//
// gridColumn1
@@ -310,7 +316,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 12;
+ this.gridColumn8.VisibleIndex = 13;
this.gridColumn8.Width = 94;
//
// gridColumn11
@@ -326,6 +332,40 @@
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 7;
this.gridColumn11.Width = 94;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn12.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn12.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn12.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn12.Caption = "Mes/Erp搴撳瓨";
+ this.gridColumn12.FieldName = "kcQty";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 8;
+ this.gridColumn12.Width = 94;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "SRM閫佽揣鍗�";
+ this.gridColumn13.FieldName = "paperBillNo";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 14;
+ this.gridColumn13.Width = 94;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "SRM鏍囪瘑";
+ this.gridColumn14.FieldName = "isSrmChk";
+ this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Visible = true;
+ this.gridColumn14.VisibleIndex = 15;
+ this.gridColumn14.Width = 94;
//
// panelControl1
//
@@ -400,5 +440,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
}
}
\ No newline at end of file
--
Gitblit v1.9.3