From e55375b7e21c648b08257312e88a9848996d82b7 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 03 八月 2025 16:48:43 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs | 150 ++++++++++++++++++++++++++++++++------------------
1 files changed, 96 insertions(+), 54 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
index 3853c87..cf3c5f1 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
@@ -1,6 +1,9 @@
锘縰sing DevExpress.Utils.MVVM.Services;
+using DevExpress.XtraGrid.Views.Base.ViewInfo;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout.Customization;
+using DevExpress.XtraPivotGrid.Data;
+using DevExpress.XtraRichEdit.Model;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -25,10 +28,11 @@
InitializeComponent();
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "docStusTxt", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fgCheckStatusChk", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
}, tips);
@@ -41,37 +45,9 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- btnZsm.Click += (s, e) =>
- {
- if (!MsgHelper.AskQuestion("纭畾鐢熸垚鏂扮殑杩芥函鐮佸悧锛�"))
- return;
- var _obj = new
- {
- guid = lbGuid.Text.Trim(),
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "CreateTrace",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
- getModel(lbGuid.Text.Trim());
- }
- else
- MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
- }
- };
-
//杩欐槸鎵撳嵃锛岃繖鍜屽叾瀹冮〉闈㈡槸涓嶄竴鏍风殑锛屼笉鑳藉鍒惰繖閲�
- this.ucBtnPrint98.SetPlButton(false);
- this.ucBtnPrint98.btnPrintClick += (s, e) =>
+ this.ucBtnPrint98.SetPrintButton(false);
+ this.ucBtnPrint98.btnAllClick += (s, e) =>
{
string rowGuid = txt_aboutGuid.Text.Trim();
if (rowGuid.Length < 36)
@@ -82,36 +58,85 @@
}
SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "杩芥函鐮�", lbGuid.Text.Trim());
string strCodeList = "";
+ string strAction = "";
frm.UpdateParent += (ss, ee) =>
{
strCodeList = ee.StringSingle;
+ strAction = ee.Data;
};
frm.ShowDialog();
if (string.IsNullOrEmpty(strCodeList))
return;
- try
+ if (strAction == "print")
{
- string rptParameter = "rpt_trace{"
- + "100"
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + strCodeList
- + "}";
- using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ try
{
- rpt.ShowDialog();
+ string rptParameter = "rpt_trace{"
+ + "100"
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
}
- frm.Close();
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
}
- catch (Exception ex)
- {
- MsgHelper.ShowError(ex.Message);
- }
+
};
-
}
+
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+ {
+ string strMsg = "瀹℃牳";
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ guid = rowGuid,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "CreateTrace",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ MsgHelper.ShowInformation(_rtn.rtnMsg);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "fgCheckStatusChk", "fgCheckBy", "fgCheckDatet", picCheckBox, this, 1.ToString());
+ }
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -218,7 +243,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -232,7 +257,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -285,18 +310,35 @@
{
UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
}
+
+ JArray array7 = new JArray();
+ foreach (var a in _job["rtnData"]["list3"])
+ {
+ array7.Add(a);
+ }
+ DataTable dt7 = JsonConvert.DeserializeObject<DataTable>(array7.ToString());
+ if (dt7.Rows.Count > 0)
+ {
+ gcMx7.BindingContext = new BindingContext();
+ gcMx7.DataSource = dt7;
+ gcMx7.ForceInitialize();
+ gvMx7.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx7);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx7, gvMx7);
+ }
}
else
{
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3