From 63384af5165b189bfb8c682559e7c7a08d483f0b Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 25 七月 2025 08:10:50 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs | 84 +++++++++++++++++++++++++++++++++++-------
1 files changed, 70 insertions(+), 14 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
index e38fbe0..04c4e34 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
@@ -82,6 +82,7 @@
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
this.txt_dldh = new DevExpress.XtraEditors.TextEdit();
this.txt_fSubsidiary = new DevExpress.XtraEditors.TextEdit();
+ this.txt_depotId = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -98,6 +99,7 @@
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.sp_fSubsidiary = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -112,6 +114,7 @@
this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -125,6 +128,7 @@
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -160,6 +164,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dldh.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -176,6 +181,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.sp_fSubsidiary)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -225,6 +231,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -237,7 +244,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -534,7 +542,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -545,6 +553,7 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
this.splitMx1.SplitterPosition = 137;
this.splitMx1.TabIndex = 0;
@@ -566,9 +575,11 @@
this.layoutMx1.Controls.Add(this.txt_status);
this.layoutMx1.Controls.Add(this.txt_dldh);
this.layoutMx1.Controls.Add(this.txt_fSubsidiary);
+ this.layoutMx1.Controls.Add(this.txt_depotId);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem13});
+ this.layoutControlItem13,
+ this.layoutControlItem15});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(576, 277, 812, 500);
@@ -709,6 +720,14 @@
this.txt_fSubsidiary.Size = new System.Drawing.Size(200, 24);
this.txt_fSubsidiary.StyleController = this.layoutMx1;
this.txt_fSubsidiary.TabIndex = 578;
+ //
+ // txt_depotId
+ //
+ this.txt_depotId.Location = new System.Drawing.Point(912, 99);
+ this.txt_depotId.Name = "txt_depotId";
+ this.txt_depotId.Size = new System.Drawing.Size(202, 24);
+ this.txt_depotId.StyleController = this.layoutMx1;
+ this.txt_depotId.TabIndex = 579;
//
// layoutControlItem13
//
@@ -920,6 +939,17 @@
this.sp_fSubsidiary.Text = "鐢熶骇缁勭粐";
this.sp_fSubsidiary.TextSize = new System.Drawing.Size(60, 18);
//
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_depotId;
+ this.layoutControlItem15.Location = new System.Drawing.Point(828, 87);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(278, 30);
+ this.layoutControlItem15.Text = "浠撳簱ID";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -963,7 +993,8 @@
this.gvMx1remark,
this.gvMx1itemId,
this.gridColumn3,
- this.gridColumn2});
+ this.gridColumn2,
+ this.gridColumn12});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1037,7 +1068,7 @@
this.gvMx1workNo.Name = "gvMx1workNo";
this.gvMx1workNo.Tag = "query_a.work_no";
this.gvMx1workNo.Visible = true;
- this.gvMx1workNo.VisibleIndex = 4;
+ this.gvMx1workNo.VisibleIndex = 5;
this.gvMx1workNo.Width = 94;
//
// gvMx1remark
@@ -1049,7 +1080,7 @@
this.gvMx1remark.Name = "gvMx1remark";
this.gvMx1remark.Tag = "query_a.remark";
this.gvMx1remark.Visible = true;
- this.gvMx1remark.VisibleIndex = 5;
+ this.gvMx1remark.VisibleIndex = 6;
this.gvMx1remark.Width = 94;
//
// gvMx1itemId
@@ -1060,8 +1091,6 @@
this.gvMx1itemId.MinWidth = 50;
this.gvMx1itemId.Name = "gvMx1itemId";
this.gvMx1itemId.Tag = "query_a.item_id";
- this.gvMx1itemId.Visible = true;
- this.gvMx1itemId.VisibleIndex = 6;
this.gvMx1itemId.Width = 94;
//
// gridColumn3
@@ -1083,6 +1112,16 @@
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 7;
this.gridColumn2.Width = 94;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "鐗╂枡鍗曚綅";
+ this.gridColumn12.FieldName = "dwName";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 4;
+ this.gridColumn12.Width = 94;
//
// tabMxPage2
//
@@ -1115,7 +1154,8 @@
this.gvMx2depotSectionCode,
this.gridColumn6,
this.gridColumn5,
- this.gvMx2remark});
+ this.gvMx2remark,
+ this.gridColumn13});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1189,7 +1229,7 @@
this.gvMx2depotCode.Name = "gvMx2depotCode";
this.gvMx2depotCode.Tag = "query_a.DEPOT_CODE";
this.gvMx2depotCode.Visible = true;
- this.gvMx2depotCode.VisibleIndex = 5;
+ this.gvMx2depotCode.VisibleIndex = 6;
this.gvMx2depotCode.Width = 94;
//
// gvMx2depotSectionCode
@@ -1201,7 +1241,7 @@
this.gvMx2depotSectionCode.Name = "gvMx2depotSectionCode";
this.gvMx2depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
this.gvMx2depotSectionCode.Visible = true;
- this.gvMx2depotSectionCode.VisibleIndex = 6;
+ this.gvMx2depotSectionCode.VisibleIndex = 7;
this.gvMx2depotSectionCode.Width = 94;
//
// gridColumn6
@@ -1211,7 +1251,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 7;
+ this.gridColumn6.VisibleIndex = 8;
this.gridColumn6.Width = 94;
//
// gridColumn5
@@ -1221,7 +1261,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 8;
+ this.gridColumn5.VisibleIndex = 9;
this.gridColumn5.Width = 94;
//
// gvMx2remark
@@ -1233,8 +1273,18 @@
this.gvMx2remark.Name = "gvMx2remark";
this.gvMx2remark.Tag = "query_a.REMARK";
this.gvMx2remark.Visible = true;
- this.gvMx2remark.VisibleIndex = 9;
+ this.gvMx2remark.VisibleIndex = 10;
this.gvMx2remark.Width = 94;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "鐗╂枡鍗曚綅";
+ this.gridColumn13.FieldName = "dwName";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 5;
+ this.gridColumn13.Width = 94;
//
// picCheckBox
//
@@ -1290,6 +1340,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dldh.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -1306,6 +1357,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.sp_fSubsidiary)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1408,5 +1460,9 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem sp_fSubsidiary;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraEditors.TextEdit txt_depotId;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
}
}
\ No newline at end of file
--
Gitblit v1.9.3