From ae28c33700e413d5acf60d1e48bbc9870bdef5a5 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 15 八月 2025 11:27:34 +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 | 79 +++++++++++++++++++++++++++------------
1 files changed, 54 insertions(+), 25 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 0f18bec..4c06af7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
@@ -82,7 +82,9 @@
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.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -126,9 +128,9 @@
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);
- this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -162,7 +164,9 @@
((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.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -346,7 +350,7 @@
this.gv_outDate.OptionsColumn.AllowEdit = false;
this.gv_outDate.Tag = "query_a.out_date";
this.gv_outDate.Visible = true;
- this.gv_outDate.VisibleIndex = 4;
+ this.gv_outDate.VisibleIndex = 7;
this.gv_outDate.Width = 120;
//
// gv_outType
@@ -359,7 +363,7 @@
this.gv_outType.OptionsColumn.AllowEdit = false;
this.gv_outType.Tag = "query_a.out_type";
this.gv_outType.Visible = true;
- this.gv_outType.VisibleIndex = 5;
+ this.gv_outType.VisibleIndex = 8;
this.gv_outType.Width = 94;
//
// gv_checkUser
@@ -372,7 +376,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 6;
+ this.gv_checkUser.VisibleIndex = 9;
this.gv_checkUser.Width = 94;
//
// gv_checkDate
@@ -385,7 +389,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 7;
+ this.gv_checkDate.VisibleIndex = 10;
this.gv_checkDate.Width = 120;
//
// gv_receiver
@@ -398,7 +402,7 @@
this.gv_receiver.OptionsColumn.AllowEdit = false;
this.gv_receiver.Tag = "query_a.receiver";
this.gv_receiver.Visible = true;
- this.gv_receiver.VisibleIndex = 8;
+ this.gv_receiver.VisibleIndex = 11;
this.gv_receiver.Width = 94;
//
// gv_createBy
@@ -411,7 +415,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 9;
+ this.gv_createBy.VisibleIndex = 12;
this.gv_createBy.Width = 94;
//
// gv_createDate
@@ -424,7 +428,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 10;
+ this.gv_createDate.VisibleIndex = 13;
this.gv_createDate.Width = 94;
//
// gv_remark
@@ -437,7 +441,7 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 11;
+ this.gv_remark.VisibleIndex = 14;
this.gv_remark.Width = 94;
//
// gv_workNo
@@ -450,7 +454,7 @@
this.gv_workNo.OptionsColumn.AllowEdit = false;
this.gv_workNo.Tag = "query_a.work_no";
this.gv_workNo.Visible = true;
- this.gv_workNo.VisibleIndex = 12;
+ this.gv_workNo.VisibleIndex = 4;
this.gv_workNo.Width = 100;
//
// gv_pbillNo
@@ -463,7 +467,7 @@
this.gv_pbillNo.OptionsColumn.AllowEdit = false;
this.gv_pbillNo.Tag = "query_a.pbill_no";
this.gv_pbillNo.Visible = true;
- this.gv_pbillNo.VisibleIndex = 13;
+ this.gv_pbillNo.VisibleIndex = 6;
this.gv_pbillNo.Width = 94;
//
// gridColumn7
@@ -473,7 +477,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 14;
+ this.gridColumn7.VisibleIndex = 5;
this.gridColumn7.Width = 94;
//
// gridColumn8
@@ -493,7 +497,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 16;
+ this.gridColumn11.VisibleIndex = 17;
this.gridColumn11.Width = 94;
//
// gridColumn9
@@ -503,7 +507,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 17;
+ this.gridColumn9.VisibleIndex = 16;
this.gridColumn9.Width = 94;
//
// gridColumn10
@@ -571,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);
@@ -715,6 +721,14 @@
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
//
this.layoutControlItem13.Control = this.lbGuid;
@@ -726,6 +740,17 @@
this.layoutControlItem13.Text = "lbGuid";
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem13.TextVisible = false;
+ //
+ // 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);
//
// Root
//
@@ -1251,6 +1276,16 @@
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
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1261,16 +1296,6 @@
this.picCheckBox.TabIndex = 8;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // 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;
//
// Frm_MesInvItemOut_SCLL
//
@@ -1315,7 +1340,9 @@
((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.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1435,5 +1462,7 @@
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