From a985c4d4b80fbf3eb4abbe385adcd0536fd29eda Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 22 十一月 2024 15:04:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 2d8694a..58ab9b5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -74,7 +74,7 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
- this.gv_factory = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_fSubsidiary = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_paymentParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_transportMethod = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -82,6 +82,7 @@
this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkFalg = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.gv_factory = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_documentStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_documentType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -113,7 +114,6 @@
this.panel1 = new System.Windows.Forms.Panel();
this.lbGuid = new DevExpress.XtraEditors.LabelControl();
this.txt_supplier = new Gs.DevApp.UserControl.UcLookSupplier();
- this.gv_fSubsidiary = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
@@ -796,15 +796,15 @@
this.gridView1.OptionsView.ShowColumnHeaders = false;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
- // gv_factory
+ // gv_fSubsidiary
//
- this.gv_factory.Caption = "ERPID鍙�";
- this.gv_factory.FieldName = "ebelnK3id";
- this.gv_factory.MinWidth = 25;
- this.gv_factory.Name = "gv_factory";
- this.gv_factory.OptionsColumn.AllowEdit = false;
- this.gv_factory.Visible = true;
- this.gv_factory.Width = 80;
+ this.gv_fSubsidiary.Caption = "鏀舵枡缁勭粐";
+ this.gv_fSubsidiary.FieldName = "fSubsidiary";
+ this.gv_fSubsidiary.MinWidth = 25;
+ this.gv_fSubsidiary.Name = "gv_fSubsidiary";
+ this.gv_fSubsidiary.OptionsColumn.AllowEdit = false;
+ this.gv_fSubsidiary.Visible = true;
+ this.gv_fSubsidiary.Width = 250;
//
// gv_paymentParty
//
@@ -890,6 +890,16 @@
this.gv_checkFalg.Tag = "query_a.CHECK_FALG";
this.gv_checkFalg.Width = 100;
//
+ // gv_factory
+ //
+ this.gv_factory.Caption = "ERPID鍙�";
+ this.gv_factory.FieldName = "ebelnK3id";
+ this.gv_factory.MinWidth = 25;
+ this.gv_factory.Name = "gv_factory";
+ this.gv_factory.OptionsColumn.AllowEdit = false;
+ this.gv_factory.Visible = true;
+ this.gv_factory.Width = 80;
+ //
// gv_billNo
//
this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -914,7 +924,7 @@
this.gv_documentStatus.OptionsColumn.AllowEdit = false;
this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS";
this.gv_documentStatus.Visible = true;
- this.gv_documentStatus.Width = 100;
+ this.gv_documentStatus.Width = 130;
//
// gv_documentType
//
@@ -1272,15 +1282,6 @@
this.txt_supplier.Size = new System.Drawing.Size(305, 30);
this.txt_supplier.TabIndex = 227;
//
- // gv_fSubsidiary
- //
- this.gv_fSubsidiary.Caption = "鏀舵枡缁勭粐";
- this.gv_fSubsidiary.FieldName = "fSubsidiary";
- this.gv_fSubsidiary.MinWidth = 25;
- this.gv_fSubsidiary.Name = "gv_fSubsidiary";
- this.gv_fSubsidiary.Visible = true;
- this.gv_fSubsidiary.Width = 25;
- //
// gridBand29
//
this.gridBand29.Caption = "鏀舵枡缁勭粐";
@@ -1321,10 +1322,11 @@
this.gridBand3.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridBand3.Caption = "鍗曟嵁鐘舵��:A鍒涘缓,B瀹℃牳涓�,C宸插鏍�,D閲嶆柊瀹℃牳,Z鏆傚瓨";
this.gridBand3.Columns.Add(this.gv_documentStatus);
- this.gridBand3.MinWidth = 100;
+ this.gridBand3.MinWidth = 130;
this.gridBand3.Name = "gridBand3";
+ this.gridBand3.RowCount = 2;
this.gridBand3.VisibleIndex = 3;
- this.gridBand3.Width = 100;
+ this.gridBand3.Width = 130;
//
// gridBand4
//
--
Gitblit v1.9.3