From 9778339d53c6abbed56e27d1f49c06fa8f569cf2 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 27 五月 2025 08:40:22 +0800
Subject: [PATCH] 工单打印
---
DevApp/Gs.DevApp/UserControl/ShowUp.cs | 6 ++
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 37 +++++++++++
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 98 ++++++++++++++++++++------------
3 files changed, 102 insertions(+), 39 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 0260be3..608a9f9 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -286,6 +286,8 @@
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem45 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
+ this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -425,6 +427,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).BeginInit();
+ this.xtraTabPage5.SuspendLayout();
this.SuspendLayout();
//
// toolBarMenu1
@@ -1560,7 +1563,8 @@
this.tabMxPage1,
this.tabMxPage2,
this.xtraTabPage3,
- this.xtraTabPage4});
+ this.xtraTabPage4,
+ this.xtraTabPage5});
//
// tabMxPage1
//
@@ -1967,11 +1971,11 @@
//
this.layShuLiang.Controls.Add(this.txt_iCount_1);
this.layShuLiang.Controls.Add(this.txt_yuliang_1);
- this.layShuLiang.Location = new System.Drawing.Point(662, 44);
+ this.layShuLiang.Location = new System.Drawing.Point(654, 44);
this.layShuLiang.Name = "layShuLiang";
this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500);
this.layShuLiang.Root = this.layoutControlGroup3;
- this.layShuLiang.Size = new System.Drawing.Size(321, 28);
+ this.layShuLiang.Size = new System.Drawing.Size(317, 28);
this.layShuLiang.TabIndex = 475;
this.layShuLiang.Text = "dataLayoutControl1";
//
@@ -1980,16 +1984,16 @@
this.txt_iCount_1.Location = new System.Drawing.Point(89, 2);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(69, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(67, 24);
this.txt_iCount_1.StyleController = this.layShuLiang;
this.txt_iCount_1.TabIndex = 5;
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(249, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(247, 2);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(70, 24);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(68, 24);
this.txt_yuliang_1.StyleController = this.layShuLiang;
this.txt_yuliang_1.TabIndex = 6;
//
@@ -2014,7 +2018,7 @@
this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28);
+ this.layoutControlGroup3.Size = new System.Drawing.Size(317, 28);
this.layoutControlGroup3.TextVisible = false;
//
// layoutControlItem25
@@ -2022,7 +2026,7 @@
this.layoutControlItem25.Control = this.txt_iCount_1;
this.layoutControlItem25.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.Size = new System.Drawing.Size(160, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(158, 28);
this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�";
this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2030,16 +2034,16 @@
//
this.layoutControlItem39.Control = this.txt_yuliang_1;
this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟";
- this.layoutControlItem39.Location = new System.Drawing.Point(160, 0);
+ this.layoutControlItem39.Location = new System.Drawing.Point(158, 0);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem39.Size = new System.Drawing.Size(161, 28);
+ this.layoutControlItem39.Size = new System.Drawing.Size(159, 28);
this.layoutControlItem39.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(988, 10);
+ this.radOut.Location = new System.Drawing.Point(976, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2054,29 +2058,29 @@
// ucBtnPrint1
//
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(986, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(974, 42);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(323, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(319, 32);
this.ucBtnPrint1.TabIndex = 464;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(749, 12);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(741, 12);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(230, 24);
this.txt_psnQty_1.StyleController = this.layoutMx99;
this.txt_psnQty_1.TabIndex = 330;
this.txt_psnQty_1.Tag = "readOnly-1";
//
// txt_printRemark
//
- this.txt_printRemark.Location = new System.Drawing.Point(424, 44);
+ this.txt_printRemark.Location = new System.Drawing.Point(420, 44);
this.txt_printRemark.Name = "txt_printRemark";
this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_printRemark.Size = new System.Drawing.Size(234, 24);
+ this.txt_printRemark.Size = new System.Drawing.Size(230, 24);
this.txt_printRemark.StyleController = this.layoutMx99;
this.txt_printRemark.TabIndex = 334;
this.txt_printRemark.Tag = "readOnly-1";
@@ -2084,11 +2088,11 @@
// txt_kQty
//
this.txt_kQty.EditValue = "";
- this.txt_kQty.Location = new System.Drawing.Point(424, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(420, 12);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(230, 24);
this.txt_kQty.StyleController = this.layoutMx99;
this.txt_kQty.TabIndex = 472;
this.txt_kQty.Tag = "readonly";
@@ -2099,7 +2103,7 @@
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(230, 24);
this.txt_yQty.StyleController = this.layoutMx99;
this.txt_yQty.TabIndex = 470;
this.txt_yQty.Tag = "readonly";
@@ -2109,7 +2113,7 @@
this.txt_zQty.Location = new System.Drawing.Point(99, 12);
this.txt_zQty.Name = "txt_zQty";
this.txt_zQty.Properties.ReadOnly = true;
- this.txt_zQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_zQty.Size = new System.Drawing.Size(230, 24);
this.txt_zQty.StyleController = this.layoutMx99;
this.txt_zQty.TabIndex = 474;
//
@@ -2137,7 +2141,7 @@
columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition10.Width = 100D;
columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition11.Width = 328D;
+ columnDefinition11.Width = 323D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition7,
columnDefinition8,
@@ -2151,7 +2155,7 @@
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition8,
rowDefinition9});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -2159,23 +2163,23 @@
this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem23.Control = this.txt_kQty;
- this.layoutControlItem23.Location = new System.Drawing.Point(325, 0);
+ this.layoutControlItem23.Location = new System.Drawing.Point(321, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem23.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.radOut;
- this.layoutControlItem35.Location = new System.Drawing.Point(975, 0);
+ this.layoutControlItem35.Location = new System.Drawing.Point(963, 0);
this.layoutControlItem35.MaxSize = new System.Drawing.Size(240, 28);
this.layoutControlItem35.MinSize = new System.Drawing.Size(240, 28);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
- this.layoutControlItem35.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem35.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem35.Text = "鑷姩璁＄畻";
this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
@@ -2186,12 +2190,12 @@
this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem26.Control = this.ucBtnPrint1;
- this.layoutControlItem26.Location = new System.Drawing.Point(975, 32);
+ this.layoutControlItem26.Location = new System.Drawing.Point(963, 32);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
- this.layoutControlItem26.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem26.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem26.Text = "鎶ュ伐鎵撳嵃";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem26.TextVisible = false;
@@ -2204,18 +2208,18 @@
this.layoutControlItem22.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem22.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_printRemark;
- this.layoutControlItem21.Location = new System.Drawing.Point(325, 32);
+ this.layoutControlItem21.Location = new System.Drawing.Point(321, 32);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2225,21 +2229,21 @@
this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem24.Control = this.txt_psnQty_1;
this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
- this.layoutControlItem24.Location = new System.Drawing.Point(650, 0);
+ this.layoutControlItem24.Location = new System.Drawing.Point(642, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem24.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem24.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.layShuLiang;
- this.layoutControlItem38.Location = new System.Drawing.Point(650, 32);
+ this.layoutControlItem38.Location = new System.Drawing.Point(642, 32);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem38.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem38.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem38.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem38.TextVisible = false;
@@ -2249,7 +2253,7 @@
this.layoutControlItem36.Control = this.txt_zQty;
this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
- this.layoutControlItem36.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem36.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
//
@@ -3087,6 +3091,23 @@
this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
//
+ // xtraTabPage5
+ //
+ this.xtraTabPage5.Controls.Add(this.ucBtnPrint101);
+ this.xtraTabPage5.Name = "xtraTabPage5";
+ this.xtraTabPage5.Size = new System.Drawing.Size(1648, 481);
+ this.xtraTabPage5.Text = "鐗╂枡榻愬鏍囪瘑鍗�";
+ //
+ // ucBtnPrint101
+ //
+ this.ucBtnPrint101.guidKey = null;
+ this.ucBtnPrint101.Location = new System.Drawing.Point(7, 19);
+ this.ucBtnPrint101.Margin = new System.Windows.Forms.Padding(0);
+ this.ucBtnPrint101.Name = "ucBtnPrint101";
+ this.ucBtnPrint101.rptParameter = null;
+ this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32);
+ this.ucBtnPrint101.TabIndex = 0;
+ //
// Frm_Womdaa
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -3235,6 +3256,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).EndInit();
+ this.xtraTabPage5.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -3456,5 +3478,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem45;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage5;
+ private UserControl.UcBtnPrint ucBtnPrint101;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 48f91fa..051346f 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -76,7 +76,7 @@
{
_print98();
};
- //杩欐槸鍚庣洊鐮侊紝浠呬粎鎵撳嵃锛�
+ //杩欐槸鍚庣洊鐮�
this.ucBtnPrint100.btnDesignClick += (s, e) =>
{
ucBtnPrint100.rptParameter = "rpt_hgm{}";
@@ -84,6 +84,15 @@
this.ucBtnPrint100.btnReportClick += (s, e) =>
{
_print100();
+ };
+ //杩欐槸榻愬鏍囪瘑鍗★紝浠呬粎鎵撳嵃
+ this.ucBtnPrint101.btnDesignClick += (s, e) =>
+ {
+ ucBtnPrint101.rptParameter = "rpt_qitao{}";
+ };
+ this.ucBtnPrint101.btnReportClick += (s, e) =>
+ {
+ _print101();
};
//瀵煎叆妯℃澘
this.btnIn.Click += (s, e) =>
@@ -741,7 +750,7 @@
this.ucBtnPrint100.rptParameter = "return false";
return;
}
- this.ucBtnPrint100.rptParameter = "rpt_trace{"
+ this.ucBtnPrint100.rptParameter = "rpt_hgm{"
+ ""
+ "," + ""
+ "," + ""
@@ -751,6 +760,30 @@
}
/// <summary>
+ /// 杩欐槸榻愬
+ /// </summary>
+ private void _print101()
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1);
+ ucBtnPrint101.guidKey = rowGuid;
+ if (rowGuid.Length < 36)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犺鎵撳嵃鐨勮锛�");
+ this.ucBtnPrint101.rptParameter = "return false";
+ return;
+ }
+ this.ucBtnPrint101.rptParameter = "rpt_qitao{"
+ + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "}";
+ }
+
+ /// <summary>
/// 閲嶆墦
/// </summary>
/// <param name="sender"></param>
diff --git a/DevApp/Gs.DevApp/UserControl/ShowUp.cs b/DevApp/Gs.DevApp/UserControl/ShowUp.cs
index cdf9bcf..2821932 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowUp.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowUp.cs
@@ -69,6 +69,12 @@
xls = "003鐗╂枡妫�楠岄」鐩�.xls"
});
+ lst.Add(new
+ {
+ btnTxt = "宸ュ崟鍚庣洊鐮乗nXLS妯℃澘",
+ xls = "004宸ュ崟鍚庣洊鐮�.xls"
+ });
+
foreach (var obj in lst)
{
SimpleButton btn = new DevExpress.XtraEditors.SimpleButton();
--
Gitblit v1.9.3