From 2a8c7b4e3ebe5691fbbe84d8cf285be3f72b7c30 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 09 十二月 2024 13:38:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 94 +++++++++++++++++++---------------------------
1 files changed, 39 insertions(+), 55 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
index a938bdd..bda3c93 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
@@ -42,8 +42,6 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fSubsidiary = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fumbrella = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_createDate1 = new DevExpress.XtraEditors.LabelControl();
this.txt_createDate1 = new DevExpress.XtraEditors.TextEdit();
this.lb_itemUnit = new DevExpress.XtraEditors.LabelControl();
@@ -62,6 +60,7 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -196,8 +195,8 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 356);
- this.tabMxPage1.Text = "鏄庣粏1";
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 384);
+ this.tabMxPage1.Text = "鏉＄爜鏄庣粏";
//
// gcMx1
//
@@ -205,7 +204,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 356);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 384);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -260,30 +259,6 @@
this.gridColumn3.VisibleIndex = 8;
this.gridColumn3.Width = 94;
//
- // gv_fSubsidiary
- //
- this.gv_fSubsidiary.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fSubsidiary.AppearanceCell.Options.UseFont = true;
- this.gv_fSubsidiary.Caption = "浣跨敤缁勭粐 ";
- this.gv_fSubsidiary.FieldName = "fSubsidiary";
- this.gv_fSubsidiary.MinWidth = 50;
- this.gv_fSubsidiary.Name = "gv_fSubsidiary";
- this.gv_fSubsidiary.OptionsColumn.AllowEdit = false;
- this.gv_fSubsidiary.Tag = "query_a.FSubsidiary";
- this.gv_fSubsidiary.Width = 94;
- //
- // gv_fumbrella
- //
- this.gv_fumbrella.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fumbrella.AppearanceCell.Options.UseFont = true;
- this.gv_fumbrella.Caption = "鍒涘缓缁勭粐 ";
- this.gv_fumbrella.FieldName = "fumbrella";
- this.gv_fumbrella.MinWidth = 50;
- this.gv_fumbrella.Name = "gv_fumbrella";
- this.gv_fumbrella.OptionsColumn.AllowEdit = false;
- this.gv_fumbrella.Tag = "query_a.Fumbrella";
- this.gv_fumbrella.Width = 94;
- //
// lb_createDate1
//
this.lb_createDate1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -326,14 +301,14 @@
//
this.gv_itemUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_itemUnit.AppearanceCell.Options.UseFont = true;
- this.gv_itemUnit.Caption = "鐗╂枡鍗曚綅 ";
+ this.gv_itemUnit.Caption = "鐗╂枡鍗曚綅";
this.gv_itemUnit.FieldName = "itemUnit";
this.gv_itemUnit.MinWidth = 50;
this.gv_itemUnit.Name = "gv_itemUnit";
this.gv_itemUnit.OptionsColumn.AllowEdit = false;
- this.gv_itemUnit.Tag = "query_a.item_unit";
+ this.gv_itemUnit.Tag = "query_b.fname";
this.gv_itemUnit.Visible = true;
- this.gv_itemUnit.VisibleIndex = 4;
+ this.gv_itemUnit.VisibleIndex = 5;
this.gv_itemUnit.Width = 94;
//
// lb_itemModel
@@ -359,14 +334,14 @@
//
this.gv_itemModel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_itemModel.AppearanceCell.Options.UseFont = true;
- this.gv_itemModel.Caption = "瑙勬牸鍨嬪彿 ";
+ this.gv_itemModel.Caption = "瑙勬牸鍨嬪彿";
this.gv_itemModel.FieldName = "itemModel";
this.gv_itemModel.MinWidth = 50;
this.gv_itemModel.Name = "gv_itemModel";
this.gv_itemModel.OptionsColumn.AllowEdit = false;
this.gv_itemModel.Tag = "query_a.item_model";
this.gv_itemModel.Visible = true;
- this.gv_itemModel.VisibleIndex = 3;
+ this.gv_itemModel.VisibleIndex = 4;
this.gv_itemModel.Width = 94;
//
// lb_itemName
@@ -392,14 +367,14 @@
//
this.gv_itemName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_itemName.AppearanceCell.Options.UseFont = true;
- this.gv_itemName.Caption = "鐗╂枡鍚嶇О ";
+ this.gv_itemName.Caption = "鐗╂枡鍚嶇О";
this.gv_itemName.FieldName = "itemName";
this.gv_itemName.MinWidth = 50;
this.gv_itemName.Name = "gv_itemName";
this.gv_itemName.OptionsColumn.AllowEdit = false;
this.gv_itemName.Tag = "query_a.item_name";
this.gv_itemName.Visible = true;
- this.gv_itemName.VisibleIndex = 2;
+ this.gv_itemName.VisibleIndex = 3;
this.gv_itemName.Width = 94;
//
// lb_itemNo
@@ -425,14 +400,14 @@
//
this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
- this.gv_itemNo.Caption = "鐗╂枡缂栫爜 = ERP鐗╂枡缂栧彿||棰滆壊缂栧彿 ";
+ this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
this.gv_itemNo.FieldName = "itemNo";
this.gv_itemNo.MinWidth = 50;
this.gv_itemNo.Name = "gv_itemNo";
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 1;
+ this.gv_itemNo.VisibleIndex = 2;
this.gv_itemNo.Width = 94;
//
// gv_id
@@ -446,7 +421,7 @@
this.gv_id.OptionsColumn.AllowEdit = false;
this.gv_id.Tag = "query_a.id";
this.gv_id.Visible = true;
- this.gv_id.VisibleIndex = 0;
+ this.gv_id.VisibleIndex = 1;
this.gv_id.Width = 94;
//
// toolBarMenu1
@@ -480,19 +455,30 @@
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn4,
this.gv_id,
this.gv_itemNo,
this.gv_itemName,
this.gv_itemModel,
- this.gv_itemUnit,
- this.gv_fumbrella,
- this.gv_fSubsidiary});
+ this.gv_itemUnit});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "缁勭粐";
+ this.gridColumn4.FieldName = "fSubsidiary";
+ this.gridColumn4.MinWidth = 125;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.AllowEdit = false;
+ this.gridColumn4.Tag = "org.fnumber";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 0;
+ this.gridColumn4.Width = 125;
//
// xtraTabControl1
//
@@ -512,7 +498,7 @@
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
@@ -522,7 +508,6 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.RowsCount = 50;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
@@ -534,15 +519,15 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 182);
+ this.tabMx.Location = new System.Drawing.Point(0, 154);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 388);
+ this.tabMx.Size = new System.Drawing.Size(1126, 416);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -576,7 +561,7 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 182);
+ this.panel1.Size = new System.Drawing.Size(1126, 154);
this.panel1.TabIndex = 1;
//
// txt_tc_1
@@ -589,7 +574,7 @@
//
// txt_suppNo_1
//
- this.txt_suppNo_1.KeyFile = "";
+ this.txt_suppNo_1.IsReadly = false;
this.txt_suppNo_1.Location = new System.Drawing.Point(349, 51);
this.txt_suppNo_1.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppNo_1.Name = "txt_suppNo_1";
@@ -648,11 +633,11 @@
//
this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(270, 91);
+ this.labelControl2.Location = new System.Drawing.Point(254, 91);
this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(69, 21);
+ this.labelControl2.Size = new System.Drawing.Size(85, 21);
this.labelControl2.TabIndex = 255;
- this.labelControl2.Text = "渚涘簲鍟咺D";
+ this.labelControl2.Text = "渚涘簲鍟嗙紪鍙�";
//
// txt_suppId
//
@@ -672,7 +657,7 @@
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(85, 21);
this.labelControl1.TabIndex = 253;
- this.labelControl1.Text = "渚涘簲鍟嗙紪鍙�";
+ this.labelControl1.Text = "閫夋嫨渚涘簲鍟�";
//
// labelControl11
//
@@ -745,8 +730,6 @@
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fSubsidiary;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fumbrella;
private DevExpress.XtraEditors.LabelControl lb_createDate1;
private DevExpress.XtraEditors.TextEdit txt_createDate1;
@@ -780,5 +763,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private UserControl.UcLookSupplier txt_suppNo_1;
private DevExpress.XtraEditors.CheckEdit txt_tc_1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
}
}
\ No newline at end of file
--
Gitblit v1.9.3