From c2e1de823e648ca7e62bc868d8aaf9ad5c65a287 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 14 九月 2025 09:17:28 +0800
Subject: [PATCH] 到货单版本冲突
---
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.Designer.cs | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.Designer.cs
index 2769662..d3889d2 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.Designer.cs
@@ -39,6 +39,7 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -73,7 +74,8 @@
this.gridColumn2,
this.gridColumn4,
this.gridColumn3,
- this.gv_guid});
+ this.gv_guid,
+ this.gridColumn6});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -100,8 +102,6 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Tag = "itemId";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
this.gridColumn1.Width = 94;
//
// gv_supplierItemCode
@@ -115,7 +115,7 @@
this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
this.gv_supplierItemCode.Visible = true;
- this.gv_supplierItemCode.VisibleIndex = 5;
+ this.gv_supplierItemCode.VisibleIndex = 4;
this.gv_supplierItemCode.Width = 100;
//
// gv_supplierItemName
@@ -129,7 +129,7 @@
this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
this.gv_supplierItemName.Visible = true;
- this.gv_supplierItemName.VisibleIndex = 6;
+ this.gv_supplierItemName.VisibleIndex = 5;
this.gv_supplierItemName.Width = 120;
//
// gridColumn5
@@ -141,13 +141,13 @@
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Tag = "dab005";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 7;
+ this.gridColumn5.VisibleIndex = 6;
this.gridColumn5.Width = 250;
//
// gridColumn2
//
this.gridColumn2.Caption = "宸ュ崟鍙�";
- this.gridColumn2.FieldName = "dab001";
+ this.gridColumn2.FieldName = "daa001";
this.gridColumn2.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
@@ -187,6 +187,16 @@
this.gv_guid.OptionsColumn.ReadOnly = true;
this.gv_guid.Tag = "query_a.guid";
this.gv_guid.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "浜у搧缁戝畾";
+ this.gridColumn6.FieldName = "isFqc";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 7;
+ this.gridColumn6.Width = 94;
//
// panelControl1
//
@@ -242,5 +252,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
}
}
\ No newline at end of file
--
Gitblit v1.9.3