From 262746cb15ee6779f24adeca62eded6389df6ef9 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期四, 24 七月 2025 13:50:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesClient
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index b83bf19..285eb82 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -155,6 +155,9 @@
this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
@@ -174,6 +177,7 @@
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -1420,7 +1424,10 @@
this.gridColumn19,
this.gridColumn12,
this.gridColumn27,
- this.gridColumn28});
+ this.gridColumn28,
+ this.gridColumn29,
+ this.gridColumn30,
+ this.gridColumn31});
this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
@@ -1635,7 +1642,7 @@
this.gridColumn28.Name = "gridColumn28";
this.gridColumn28.OptionsColumn.ReadOnly = true;
this.gridColumn28.Visible = true;
- this.gridColumn28.VisibleIndex = 13;
+ this.gridColumn28.VisibleIndex = 16;
this.gridColumn28.Width = 66;
//
// repositoryItemComboBox1
@@ -1644,6 +1651,30 @@
this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+ //
+ // gridColumn29
+ //
+ this.gridColumn29.Caption = "浠撳簱缂栫爜";
+ this.gridColumn29.FieldName = "depotCode";
+ this.gridColumn29.Name = "gridColumn29";
+ this.gridColumn29.Visible = true;
+ this.gridColumn29.VisibleIndex = 13;
+ //
+ // gridColumn30
+ //
+ this.gridColumn30.Caption = "浠撳簱鍚嶇О";
+ this.gridColumn30.FieldName = "depotName";
+ this.gridColumn30.Name = "gridColumn30";
+ this.gridColumn30.Visible = true;
+ this.gridColumn30.VisibleIndex = 14;
+ //
+ // gridColumn31
+ //
+ this.gridColumn31.Caption = "浠撶鍛�";
+ this.gridColumn31.FieldName = "staffName";
+ this.gridColumn31.Name = "gridColumn31";
+ this.gridColumn31.Visible = true;
+ this.gridColumn31.VisibleIndex = 15;
//
// repositoryItemButtonEdit1
//
@@ -1699,7 +1730,8 @@
this.gridColumn17,
this.gridColumn22,
this.gridColumn23,
- this.gridColumn24});
+ this.gridColumn24,
+ this.gridColumn32});
this.gvMx2.DetailHeight = 272;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
@@ -1843,6 +1875,14 @@
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 11;
this.gridColumn24.Width = 82;
+ //
+ // gridColumn32
+ //
+ this.gridColumn32.Caption = "鍏ュ簱绫诲瀷";
+ this.gridColumn32.FieldName = "cgrkType";
+ this.gridColumn32.Name = "gridColumn32";
+ this.gridColumn32.Visible = true;
+ this.gridColumn32.VisibleIndex = 12;
//
// Frm_ArrivalBarcode
//
@@ -2075,5 +2115,9 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
}
}
\ No newline at end of file
--
Gitblit v1.9.3