From 9bc1c241443169dde866ccc73fe28a743ebf3874 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 18 六月 2025 08:05:23 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 99 +++++++++++++++++++++++--------------------------
1 files changed, 47 insertions(+), 52 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 4e45ee8..c01f4a0 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,5 +1,4 @@
-using DevExpress.XtraPivotGrid.Data;
-using Gs.DevApp.DevFrm.WOM;
+using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -53,15 +52,6 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //杩欐槸鎵樻澘鐮�
- this.ucBtnPrint1.btnDesignClick += (s, e) =>
- {
- ucBtnPrint1.rptParameter = "rpt_daa{}";
- };
- this.ucBtnPrint1.btnReportClick += (s, e) =>
- {
- _print();
- };
txt_psnQty_1.TextChanged += (s, e) =>
{
Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
@@ -70,30 +60,62 @@
{
Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
- //杩欐槸杩芥函鐮�
- this.ucBtnPrint98.btnDesignClick += (s, e) =>
+ //杩欐槸鎵樻澘鐮�
+ this.ucBtnPrint1.btnPrintClick += (s, e) =>
{
- ucBtnPrint98.rptParameter = "rpt_trace{}";
+ _print();
};
- this.ucBtnPrint98.btnReportClick += (s, e) =>
+ this.ucBtnPrint1.btnAllClick += (s, e) =>
+ {
+
+ };
+ //杩欐槸杩芥函鐮�
+ this.ucBtnPrint98.btnPrintClick += (s, e) =>
{
_print98();
};
//杩欐槸鍚庣洊鐮�
- this.ucBtnPrint100.btnDesignClick += (s, e) =>
- {
- ucBtnPrint100.rptParameter = "rpt_hgm{}";
- };
- this.ucBtnPrint100.btnReportClick += (s, e) =>
+ this.ucBtnPrint100.btnPrintClick += (s, e) =>
{
_print100();
};
- //杩欐槸榻愬鏍囪瘑鍗★紝浠呬粎鎵撳嵃
- this.ucBtnPrint101.btnDesignClick += (s, e) =>
+ this.ucBtnPrint100.btnAllClick += (s, e) =>
{
- ucBtnPrint101.rptParameter = "rpt_qitao{}";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1);
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "鍚庣洊鐮�");
+ string strCodeList = "";
+ frm.UpdateParent += (ss, ee) =>
+ {
+ strCodeList = ee.StringSingle;
+ };
+ frm.ShowDialog();
+ if (string.IsNullOrEmpty(strCodeList))
+ return;
+ try
+ {
+ string rptParameter = "rpt_hgm{"
+ + "100"
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
};
- this.ucBtnPrint101.btnReportClick += (s, e) =>
+ //杩欐槸榻愬鏍囪瘑鍗★紝浠呬粎鎵撳嵃
+ this.ucBtnPrint101.btnPrintClick += (s, e) =>
{
_print101();
};
@@ -126,34 +148,7 @@
};
frm.ShowDialog();
};
- //鎵归噺鍒犻櫎鏉＄爜
- this.btnDeleteBar.Click += (s, e) =>
- {
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_daa001, gridView1, "daa001");
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勬暟鎹紒");
- return;
- }
- SelectDeleteBar frm = new SelectDeleteBar(rowGuid,"鍚庣洊鐮�");
- //璧嬪�肩粰鏄庣粏琛�
- frm.UpdateParent += (ss, ee) =>
- {
- try
- {
- string strMsg = ee.StringSingle;
- if(strMsg=="1")
- getModel(rowGuid);
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message);
- }
- };
- frm.ShowDialog();
- };
+
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
--
Gitblit v1.9.3