From 6940ba1b4fe555c94353de9d7ab6a53a6c8884bc Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期三, 03 十二月 2025 18:27:35 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LB_MesClient
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs | 86 +++++++++++++++++++++++++++---------------
1 files changed, 55 insertions(+), 31 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
index ed5b909..acdecb4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
@@ -85,8 +85,8 @@
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_abtNo = new DevExpress.XtraEditors.TextEdit();
this.txt_kcOrg = new DevExpress.XtraEditors.TextEdit();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
- this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkUserName = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
@@ -136,8 +136,10 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.xtraTabPageReport = new DevExpress.XtraTab.XtraTabPage();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.ucRptQtdj1 = new Gs.DevApp.DevFrm.Rpt.UcRptQtdj();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -169,8 +171,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_abtNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
@@ -201,6 +203,7 @@
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ this.xtraTabPageReport.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
@@ -213,6 +216,7 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
@@ -230,7 +234,8 @@
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
- this.xtraTabPage2});
+ this.xtraTabPage2,
+ this.xtraTabPageReport});
//
// xtraTabPage1
//
@@ -378,7 +383,7 @@
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
- this.gv_checkUser.FieldName = "checkUser";
+ this.gv_checkUser.FieldName = "checkUserName";
this.gv_checkUser.MinWidth = 25;
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
@@ -430,7 +435,7 @@
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
- this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.FieldName = "createByName";
this.gv_createBy.MinWidth = 25;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
@@ -618,8 +623,8 @@
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_abtNo);
this.layoutMx1.Controls.Add(this.txt_kcOrg);
- this.layoutMx1.Controls.Add(this.txt_createBy);
- this.layoutMx1.Controls.Add(this.txt_checkUser);
+ this.layoutMx1.Controls.Add(this.txt_createByName);
+ this.layoutMx1.Controls.Add(this.txt_checkUserName);
this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Controls.Add(this.txt_status);
this.layoutMx1.Controls.Add(this.txt_guid);
@@ -751,23 +756,23 @@
this.txt_kcOrg.StyleController = this.layoutMx1;
this.txt_kcOrg.TabIndex = 216;
//
- // txt_createBy
+ // txt_createByName
//
- this.txt_createBy.Location = new System.Drawing.Point(636, 41);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(200, 24);
- this.txt_createBy.StyleController = this.layoutMx1;
- this.txt_createBy.TabIndex = 222;
+ this.txt_createByName.Location = new System.Drawing.Point(636, 41);
+ this.txt_createByName.Name = "txt_createByName";
+ this.txt_createByName.Properties.Appearance.Options.UseFont = true;
+ this.txt_createByName.Size = new System.Drawing.Size(200, 24);
+ this.txt_createByName.StyleController = this.layoutMx1;
+ this.txt_createByName.TabIndex = 222;
//
- // txt_checkUser
+ // txt_checkUserName
//
- this.txt_checkUser.Location = new System.Drawing.Point(912, 41);
- this.txt_checkUser.Name = "txt_checkUser";
- this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(202, 24);
- this.txt_checkUser.StyleController = this.layoutMx1;
- this.txt_checkUser.TabIndex = 258;
+ this.txt_checkUserName.Location = new System.Drawing.Point(912, 41);
+ this.txt_checkUserName.Name = "txt_checkUserName";
+ this.txt_checkUserName.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkUserName.Size = new System.Drawing.Size(202, 24);
+ this.txt_checkUserName.StyleController = this.layoutMx1;
+ this.txt_checkUserName.TabIndex = 258;
//
// txt_createDate
//
@@ -935,7 +940,7 @@
//
// layoutControlItem7
//
- this.layoutControlItem7.Control = this.txt_createBy;
+ this.layoutControlItem7.Control = this.txt_createByName;
this.layoutControlItem7.Location = new System.Drawing.Point(552, 29);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -946,7 +951,7 @@
//
// layoutControlItem8
//
- this.layoutControlItem8.Control = this.txt_checkUser;
+ this.layoutControlItem8.Control = this.txt_checkUserName;
this.layoutControlItem8.Location = new System.Drawing.Point(828, 29);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1201,7 +1206,7 @@
// gridColumn4
//
this.gridColumn4.Caption = "寤虹珛鑰�";
- this.gridColumn4.FieldName = "createBy";
+ this.gridColumn4.FieldName = "createByName";
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
@@ -1329,7 +1334,7 @@
// gridColumn2
//
this.gridColumn2.Caption = "寤虹珛鑰�";
- this.gridColumn2.FieldName = "createBy";
+ this.gridColumn2.FieldName = "createByName";
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
@@ -1358,6 +1363,14 @@
this.gvMx2remark.VisibleIndex = 8;
this.gvMx2remark.Width = 94;
//
+ // xtraTabPageReport
+ //
+ this.xtraTabPageReport.Controls.Add(this.ucRptQtdj1);
+ this.xtraTabPageReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
+ this.xtraTabPageReport.Name = "xtraTabPageReport";
+ this.xtraTabPageReport.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPageReport.Text = "鎶ヨ〃";
+ //
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1368,6 +1381,14 @@
this.picCheckBox.TabIndex = 9;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // ucRptQtdj1
+ //
+ this.ucRptQtdj1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ucRptQtdj1.Location = new System.Drawing.Point(0, 0);
+ this.ucRptQtdj1.Name = "ucRptQtdj1";
+ this.ucRptQtdj1.Size = new System.Drawing.Size(1126, 570);
+ this.ucRptQtdj1.TabIndex = 0;
//
// Frm_MesItemQtDj
//
@@ -1410,8 +1431,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_abtNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kcOrg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
@@ -1442,6 +1463,7 @@
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ this.xtraTabPageReport.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -1480,10 +1502,10 @@
private DevExpress.XtraEditors.TextEdit txt_lykh;
private DevExpress.XtraEditors.TextEdit txt_abtNo;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
- private DevExpress.XtraEditors.TextEdit txt_checkUser;
+ private DevExpress.XtraEditors.TextEdit txt_checkUserName;
private DevExpress.XtraEditors.TextEdit txt_sqRemark;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraEditors.TextEdit txt_createBy;
+ private DevExpress.XtraEditors.TextEdit txt_createByName;
private DevExpress.XtraEditors.TextEdit txt_kcOrg;
private DevExpress.XtraEditors.TextEdit txt_itemOutNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
@@ -1545,5 +1567,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPageReport;
+ private Rpt.UcRptQtdj ucRptQtdj1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3