From b0cebba8ea5393c5de74f4b09078f7a4d3d3e8cf Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 13 十二月 2024 10:38:09 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs | 154 ++++++++++++++++++++++++++-------------------------
1 files changed, 78 insertions(+), 76 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
index 457e53b..9a55107 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
@@ -1,7 +1,7 @@
/* Create By GS EasyCode */
namespace Gs.DevApp.DevFrm
{
- partial class Frm_MesDepot
+ partial class Frm_MesDepot
{
/// <summary>
/// Required designer variable.
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1depotSectionNamet = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1kbQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -276,7 +276,7 @@
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1124, 338);
- this.tabMxPage1.Text = "鏄庣粏1";
+ this.tabMxPage1.Text = "浠撲綅鍒楄〃";
//
// gcMx1
//
@@ -324,10 +324,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -935,6 +935,7 @@
this.gridColumn1.MinWidth = 250;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
+ this.gridColumn1.Tag = "org.FNumber";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
this.gridColumn1.Width = 250;
@@ -946,6 +947,7 @@
this.gv_id.MinWidth = 25;
this.gv_id.Name = "gv_id";
this.gv_id.OptionsColumn.AllowEdit = false;
+ this.gv_id.Tag = "query_a.depot_Id";
this.gv_id.Visible = true;
this.gv_id.VisibleIndex = 1;
this.gv_id.Width = 94;
@@ -1002,7 +1004,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
//
@@ -1023,7 +1025,7 @@
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
@@ -1166,7 +1168,7 @@
}
#endregion
- private UserControl.UcToolBarMenu toolBarMenu1;
+ private UserControl.UcToolBarMenu toolBarMenu1;
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
@@ -1176,89 +1178,89 @@
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.LabelControl labelControl11;
- private DevExpress.XtraTab.XtraTabControl tabMx;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionNamet;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1kbQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateBy;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1description;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1completenessFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionName;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraTab.XtraTabControl tabMx;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionNamet;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1kbQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1description;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1completenessFlag;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionName;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-private DevExpress.XtraEditors.LabelControl lb_materialProperti;
-private DevExpress.XtraEditors.TextEdit txt_materialProperti;
+ private DevExpress.XtraEditors.LabelControl lb_materialProperti;
+ private DevExpress.XtraEditors.TextEdit txt_materialProperti;
-private DevExpress.XtraEditors.LabelControl lb_isFkc;
-private DevExpress.XtraEditors.TextEdit txt_isFkc;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isFkc;
+ private DevExpress.XtraEditors.LabelControl lb_isFkc;
+ private DevExpress.XtraEditors.TextEdit txt_isFkc;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_isFkc;
-private DevExpress.XtraEditors.LabelControl lb_zuid;
-private DevExpress.XtraEditors.TextEdit txt_zuid;
- private DevExpress.XtraGrid.Columns.GridColumn gv_zuid;
+ private DevExpress.XtraEditors.LabelControl lb_zuid;
+ private DevExpress.XtraEditors.TextEdit txt_zuid;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_zuid;
-private DevExpress.XtraEditors.LabelControl lb_piType;
-private DevExpress.XtraEditors.TextEdit txt_piType;
+ private DevExpress.XtraEditors.LabelControl lb_piType;
+ private DevExpress.XtraEditors.TextEdit txt_piType;
-private DevExpress.XtraEditors.LabelControl lb_cwhaddress;
-private DevExpress.XtraEditors.TextEdit txt_cwhaddress;
+ private DevExpress.XtraEditors.LabelControl lb_cwhaddress;
+ private DevExpress.XtraEditors.TextEdit txt_cwhaddress;
-private DevExpress.XtraEditors.LabelControl lb_isNg;
-private DevExpress.XtraEditors.TextEdit txt_isNg;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isNg;
+ private DevExpress.XtraEditors.LabelControl lb_isNg;
+ private DevExpress.XtraEditors.TextEdit txt_isNg;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_isNg;
-private DevExpress.XtraEditors.LabelControl lb_isWy;
-private DevExpress.XtraEditors.TextEdit txt_isWy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isWy;
+ private DevExpress.XtraEditors.LabelControl lb_isWy;
+ private DevExpress.XtraEditors.TextEdit txt_isWy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_isWy;
-private DevExpress.XtraEditors.LabelControl lb_iconType;
-private DevExpress.XtraEditors.TextEdit txt_iconType;
+ private DevExpress.XtraEditors.LabelControl lb_iconType;
+ private DevExpress.XtraEditors.TextEdit txt_iconType;
-private DevExpress.XtraEditors.LabelControl lb_depottypecode;
-private DevExpress.XtraEditors.TextEdit txt_depottypecode;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depottypecode;
+ private DevExpress.XtraEditors.LabelControl lb_depottypecode;
+ private DevExpress.XtraEditors.TextEdit txt_depottypecode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depottypecode;
-private DevExpress.XtraEditors.LabelControl lb_type2;
-private DevExpress.XtraEditors.TextEdit txt_type2;
+ private DevExpress.XtraEditors.LabelControl lb_type2;
+ private DevExpress.XtraEditors.TextEdit txt_type2;
-private DevExpress.XtraEditors.LabelControl lb_type1;
-private DevExpress.XtraEditors.TextEdit txt_type1;
+ private DevExpress.XtraEditors.LabelControl lb_type1;
+ private DevExpress.XtraEditors.TextEdit txt_type1;
-private DevExpress.XtraEditors.LabelControl lb_factory;
-private DevExpress.XtraEditors.TextEdit txt_factory;
+ private DevExpress.XtraEditors.LabelControl lb_factory;
+ private DevExpress.XtraEditors.TextEdit txt_factory;
-private DevExpress.XtraEditors.LabelControl lb_depottype;
-private DevExpress.XtraEditors.TextEdit txt_depottype;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depottype;
+ private DevExpress.XtraEditors.LabelControl lb_depottype;
+ private DevExpress.XtraEditors.TextEdit txt_depottype;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depottype;
-private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
-private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
+ private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
+ private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
-private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
-private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
+ private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
+ private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
-private DevExpress.XtraEditors.LabelControl lb_createDate;
-private DevExpress.XtraEditors.TextEdit txt_createDate;
+ private DevExpress.XtraEditors.LabelControl lb_createDate;
+ private DevExpress.XtraEditors.TextEdit txt_createDate;
-private DevExpress.XtraEditors.LabelControl lb_createBy;
-private DevExpress.XtraEditors.TextEdit txt_createBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+ private DevExpress.XtraEditors.LabelControl lb_createBy;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-private DevExpress.XtraEditors.LabelControl lb_description;
-private DevExpress.XtraEditors.TextEdit txt_description;
- private DevExpress.XtraGrid.Columns.GridColumn gv_description;
+ private DevExpress.XtraEditors.LabelControl lb_description;
+ private DevExpress.XtraEditors.TextEdit txt_description;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_description;
-private DevExpress.XtraEditors.LabelControl lb_depotName;
-private DevExpress.XtraEditors.TextEdit txt_depotName;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depotName;
+ private DevExpress.XtraEditors.LabelControl lb_depotName;
+ private DevExpress.XtraEditors.TextEdit txt_depotName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotName;
-private DevExpress.XtraEditors.LabelControl lb_depotCode;
-private DevExpress.XtraEditors.TextEdit txt_depotCode;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
+ private DevExpress.XtraEditors.LabelControl lb_depotCode;
+ private DevExpress.XtraEditors.TextEdit txt_depotCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gv_id;
--
Gitblit v1.9.3