From 89776d6f53dff45b1ac0ee20438f5aa8dab2d0e5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 16 六月 2025 17:13:31 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 107 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 98 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 48f91fa..4e45ee8 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -20,6 +20,9 @@
public Frm_Womdaa()
{
InitializeComponent();
+ this.splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
+ this.splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
+ this.splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
// this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
@@ -27,7 +30,7 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.btnZhongTaiClick += ToolBarMenu1_btnZhongTaiClick;
this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick;
- // this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
+ this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
@@ -76,7 +79,7 @@
{
_print98();
};
- //杩欐槸鍚庣洊鐮侊紝浠呬粎鎵撳嵃锛�
+ //杩欐槸鍚庣洊鐮�
this.ucBtnPrint100.btnDesignClick += (s, e) =>
{
ucBtnPrint100.rptParameter = "rpt_hgm{}";
@@ -84,6 +87,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) =>
@@ -114,8 +126,35 @@
};
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)
{
@@ -256,10 +295,10 @@
{
_toolCk(7);
}
- //private void ToolBarMenu1_btnKgClick(object sender, EventArgs e)
- //{
- // _toolCk(8);
- //}
+ private void ToolBarMenu1_btnKgClick(object sender, EventArgs e)
+ {
+ _toolCk(8);
+ }
private void ToolBarMenu1_btnWgClick(object sender, EventArgs e)
{
_toolCk(9);
@@ -554,6 +593,32 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx4, gvMx4);
}
+ //鍔犱笂鎵撳嵃鏉冮檺
+ JArray array5 = new JArray();
+ foreach (var a in _job["rtnData"]["list5"])
+ {
+ if (a["blackName"].ToString() == "鎵樻澘鐮佹墦鍗�")
+ {
+ splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
+ continue;
+ }
+ if (a["blackName"].ToString() == "杩芥函鐮佹墦鍗�")
+ {
+ splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
+ continue;
+ }
+ if (a["blackName"].ToString() == "鍚庣洊鐮佹墦鍗�")
+ {
+ splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
+ continue;
+ }
+ if (a["blackName"].ToString() == "榻愬鏍囪瘑鍗℃墦鍗�")
+ {
+ xtraTabPage5.PageVisible = true;
+ continue;
+ }
+ }
+
txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
}
else
@@ -665,7 +730,7 @@
this.ucBtnPrint1.rptParameter = "return false";
return;
}
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim()))
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
txt_iCount_1.Focus();
@@ -741,7 +806,7 @@
this.ucBtnPrint100.rptParameter = "return false";
return;
}
- this.ucBtnPrint100.rptParameter = "rpt_trace{"
+ this.ucBtnPrint100.rptParameter = "rpt_hgm{"
+ ""
+ "," + ""
+ "," + ""
@@ -751,6 +816,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>
--
Gitblit v1.9.3