From 21b23802a3f32aebcfb77fcebda1e7cc956e21dd Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 02 十二月 2025 10:26:00 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LB_MesClient
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 98 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 64 insertions(+), 34 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index a361b64..729d511 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -104,6 +104,7 @@
this.gridColumn103 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn104 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn110 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit7 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.repositoryItemButtonEdit8 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.repositoryItemComboBox4 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
@@ -188,7 +189,7 @@
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.lay99 = new DevExpress.XtraLayout.LayoutControl();
- this.ucBtnPrintOne1 = new Gs.DevApp.UserControl.UcBtnPrintOne();
+ this.ucBtnPrintOne2 = new Gs.DevApp.UserControl.UcBtnPrintOne();
this.layoutControl2 = new DevExpress.XtraLayout.LayoutControl();
this.txt_iCount_2 = new DevExpress.XtraEditors.TextEdit();
this.txt_yuliang_2 = new DevExpress.XtraEditors.TextEdit();
@@ -239,6 +240,7 @@
this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn109 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
@@ -321,8 +323,8 @@
this.gv_hbdy = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
- this.gridColumn109 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn110 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.ucBtnPrintOne1 = new Gs.DevApp.UserControl.UcBtnPrintOne();
+ this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -477,6 +479,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -538,7 +541,7 @@
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1355, 592);
- this.split1.SplitterPosition = 416;
+ this.split1.SplitterPosition = 376;
this.split1.TabIndex = 0;
//
// gcMain1
@@ -549,7 +552,7 @@
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1355, 136);
+ this.gcMain1.Size = new System.Drawing.Size(1355, 176);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -793,7 +796,7 @@
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 136);
+ this.pageBar1.Location = new System.Drawing.Point(0, 176);
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
@@ -808,7 +811,7 @@
this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.xtraTabPage5;
- this.xtraTabControl2.Size = new System.Drawing.Size(1355, 416);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1355, 376);
this.xtraTabControl2.TabIndex = 4;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage5,
@@ -819,7 +822,7 @@
//
this.xtraTabPage5.Controls.Add(this.gcMxL2);
this.xtraTabPage5.Name = "xtraTabPage5";
- this.xtraTabPage5.Size = new System.Drawing.Size(1353, 390);
+ this.xtraTabPage5.Size = new System.Drawing.Size(1353, 350);
this.xtraTabPage5.Text = "鍚堝苟鏄庣粏";
//
// gcMxL2
@@ -834,7 +837,7 @@
this.repositoryItemButtonEdit7,
this.repositoryItemButtonEdit8,
this.repositoryItemComboBox4});
- this.gcMxL2.Size = new System.Drawing.Size(1353, 390);
+ this.gcMxL2.Size = new System.Drawing.Size(1353, 350);
this.gcMxL2.TabIndex = 3;
this.gcMxL2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMxL2});
@@ -1054,6 +1057,14 @@
this.gridColumn105.Name = "gridColumn105";
this.gridColumn105.Visible = true;
this.gridColumn105.VisibleIndex = 13;
+ //
+ // gridColumn110
+ //
+ this.gridColumn110.Caption = "闇�姹傝窡韪彿";
+ this.gridColumn110.FieldName = "xqgz";
+ this.gridColumn110.Name = "gridColumn110";
+ this.gridColumn110.Visible = true;
+ this.gridColumn110.VisibleIndex = 14;
//
// repositoryItemButtonEdit7
//
@@ -2020,7 +2031,7 @@
//
// lay99
//
- this.lay99.Controls.Add(this.ucBtnPrintOne1);
+ this.lay99.Controls.Add(this.ucBtnPrintOne2);
this.lay99.Controls.Add(this.layoutControl2);
this.lay99.Controls.Add(this.radOut2);
this.lay99.Controls.Add(this.ucBtnPrint2);
@@ -2041,16 +2052,16 @@
this.lay99.TabIndex = 0;
this.lay99.Text = "layoutControl2";
//
- // ucBtnPrintOne1
+ // ucBtnPrintOne2
//
- this.ucBtnPrintOne1.allClickKey = null;
- this.ucBtnPrintOne1.guidKey = null;
- this.ucBtnPrintOne1.Location = new System.Drawing.Point(1011, 12);
- this.ucBtnPrintOne1.Margin = new System.Windows.Forms.Padding(0);
- this.ucBtnPrintOne1.Name = "ucBtnPrintOne1";
- this.ucBtnPrintOne1.rptParameter = null;
- this.ucBtnPrintOne1.Size = new System.Drawing.Size(330, 52);
- this.ucBtnPrintOne1.TabIndex = 485;
+ this.ucBtnPrintOne2.allClickKey = null;
+ this.ucBtnPrintOne2.guidKey = null;
+ this.ucBtnPrintOne2.Location = new System.Drawing.Point(1011, 12);
+ this.ucBtnPrintOne2.Margin = new System.Windows.Forms.Padding(0);
+ this.ucBtnPrintOne2.Name = "ucBtnPrintOne2";
+ this.ucBtnPrintOne2.rptParameter = null;
+ this.ucBtnPrintOne2.Size = new System.Drawing.Size(330, 52);
+ this.ucBtnPrintOne2.TabIndex = 485;
//
// layoutControl2
//
@@ -2406,7 +2417,7 @@
//
// layoutControlItem41
//
- this.layoutControlItem41.Control = this.ucBtnPrintOne1;
+ this.layoutControlItem41.Control = this.ucBtnPrintOne2;
this.layoutControlItem41.Location = new System.Drawing.Point(999, 0);
this.layoutControlItem41.Name = "layoutControlItem41";
this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -2647,6 +2658,14 @@
this.gridColumn54.Visible = true;
this.gridColumn54.VisibleIndex = 14;
//
+ // gridColumn109
+ //
+ this.gridColumn109.Caption = "闇�姹傝窡韪彿";
+ this.gridColumn109.FieldName = "xqgz";
+ this.gridColumn109.Name = "gridColumn109";
+ this.gridColumn109.Visible = true;
+ this.gridColumn109.VisibleIndex = 8;
+ //
// repositoryItemButtonEdit3
//
this.repositoryItemButtonEdit3.AutoHeight = false;
@@ -2700,6 +2719,7 @@
//
// layout99
//
+ this.layout99.Controls.Add(this.ucBtnPrintOne1);
this.layout99.Controls.Add(this.layoutControl1);
this.layout99.Controls.Add(this.lbMxGuid);
this.layout99.Controls.Add(this.ucBtnPrint1);
@@ -2946,7 +2966,8 @@
this.layoutControlItem21,
this.layoutControlItem22,
this.layoutControlItem23,
- this.layoutControlItem25});
+ this.layoutControlItem25,
+ this.layoutControlItem42});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -3614,21 +3635,27 @@
this.gv_hbdy.Visible = true;
this.gv_hbdy.VisibleIndex = 13;
//
- // gridColumn109
+ // ucBtnPrintOne1
//
- this.gridColumn109.Caption = "闇�姹傝窡韪彿";
- this.gridColumn109.FieldName = "xqgz";
- this.gridColumn109.Name = "gridColumn109";
- this.gridColumn109.Visible = true;
- this.gridColumn109.VisibleIndex = 8;
+ this.ucBtnPrintOne1.allClickKey = null;
+ this.ucBtnPrintOne1.guidKey = null;
+ this.ucBtnPrintOne1.Location = new System.Drawing.Point(1011, 89);
+ this.ucBtnPrintOne1.Margin = new System.Windows.Forms.Padding(0);
+ this.ucBtnPrintOne1.Name = "ucBtnPrintOne1";
+ this.ucBtnPrintOne1.rptParameter = null;
+ this.ucBtnPrintOne1.Size = new System.Drawing.Size(330, 35);
+ this.ucBtnPrintOne1.TabIndex = 478;
//
- // gridColumn110
+ // layoutControlItem42
//
- this.gridColumn110.Caption = "闇�姹傝窡韪彿";
- this.gridColumn110.FieldName = "xqgz";
- this.gridColumn110.Name = "gridColumn110";
- this.gridColumn110.Visible = true;
- this.gridColumn110.VisibleIndex = 14;
+ this.layoutControlItem42.Control = this.ucBtnPrintOne1;
+ this.layoutControlItem42.Location = new System.Drawing.Point(999, 77);
+ this.layoutControlItem42.Name = "layoutControlItem42";
+ this.layoutControlItem42.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem42.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem42.Size = new System.Drawing.Size(334, 39);
+ this.layoutControlItem42.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem42.TextVisible = false;
//
// Frm_ArrivalBarcode
//
@@ -3794,6 +3821,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).EndInit();
this.ResumeLayout(false);
}
@@ -4060,9 +4088,11 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn107;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn108;
- private UserControl.UcBtnPrintOne ucBtnPrintOne1;
+ private UserControl.UcBtnPrintOne ucBtnPrintOne2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn110;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn109;
+ private UserControl.UcBtnPrintOne ucBtnPrintOne1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem42;
}
}
\ No newline at end of file
--
Gitblit v1.9.3