From e9daa5f88d0df2f377837544d2866f2ab8f74d9e Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 20 八月 2025 21:28:31 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs | 91 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 83 insertions(+), 8 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
index 1e71466..788cf68 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
@@ -28,6 +28,7 @@
public Frm_MESJJERRORJS()
{
InitializeComponent();
+
gridView2.CellValueChanged += gridView2_CellValueChanged;
this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
@@ -38,7 +39,8 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
- this.toolBarMenu1.getXmlConfig();
+ btnFZ.Click += btnFZ_Click;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -50,8 +52,14 @@
{
getPageList(this.pageBar1.CurrentPage);
}, lbGuid);
+ // 寤惰繜璋冪敤 getXmlConfig锛岀‘淇� GridView 瀹屽叏鍒濆鍖栧悗鍐嶆仮澶嶅竷灞�
+ this.Load += (s, e) =>
+ {
+ this.toolBarMenu1.getXmlConfig();
+ };
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ txt_DAA001.EditValueChanged += txt_DAA001_EditValueChanged;
//閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
btnSelect.Click += (s, e) =>
@@ -79,7 +87,11 @@
}
DataTable _newTable = JsonConvert.DeserializeObject<DataTable>(array.ToString());
- DataTable _oldTable = _newTable.Clone();
+ DataTable _oldTable = gridControl1.DataSource as DataTable;
+ if (_oldTable == null)
+ {
+ _oldTable = _newTable.Clone();
+ }
DataRow[] sourceRows = _newTable.Select();
for (int i = 0; i < sourceRows.Length; i++)
{
@@ -285,7 +297,7 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "errorNo");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_ErrorNo, gridView1, "errorNo");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -428,7 +440,6 @@
var row = gridView2.GetDataRow(i);
if (row != null)
{
- Guid? _guid = UtilityHelper.ToGuid(row["id"].ToString());
if (string.IsNullOrEmpty(row["staffId"].ToString()))
{
MsgHelper.ShowError("鍛樺伐涓嶈兘涓虹┖锛�");
@@ -452,8 +463,8 @@
_obj.list.Add(new
{
- Guid = _guid,
- ID = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["id"].ToString()),
+ Guid = "",
+ ID = "",
Staff_Id = row["staffId"].ToString(),
Staff_No = row["staffNo"].ToString(),
Staff_Name = row["staffName"].ToString(),
@@ -618,7 +629,7 @@
;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "errorNo");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_ErrorNo, gridView1, "errorNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -665,8 +676,20 @@
{
txt_HourlyType.EditValue = SelectedDataRow["璁℃椂绫诲瀷"].ToString();
txt_HourlySalary.EditValue = SelectedDataRow["璁℃椂鍗曚环"];
+
+ var hourlySalary = decimal.Parse(txt_HourlySalary.EditValue.ToString());
+ for (int i = 0; i < gridView2.DataRowCount; i++)
+ {
+ DataRow row = gridView2.GetDataRow(i);
+ decimal hour = 0;
+ decimal.TryParse(row["hour"]?.ToString(), out hour);
+ if (row != null)
+ {
+ row["salary"] = hourlySalary * hour;
+ }
+ }
+ gridView2.RefreshData();
}
-
}
private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
@@ -713,5 +736,57 @@
}
}
}
+
+ private void btnFZ_Click(object sender, EventArgs e)
+ {
+ // 鑾峰彇褰撳墠閫変腑琛岀殑琛屽彿
+ int focusedRowHandle = gridView2.FocusedRowHandle;
+ if (focusedRowHandle < 0) return;
+
+ // 鑾峰彇褰撳墠琛岀殑鏃堕暱
+ DataRow currentRow = gridView2.GetDataRow(focusedRowHandle);
+ if (currentRow == null) return;
+
+ var hourValue = currentRow["hour"];
+ if (hourValue == null) return;
+
+ decimal hourlySalary = 0;
+ decimal hour = 0;
+ decimal.TryParse(txt_HourlySalary.Text, out hourlySalary);
+ // 鑾峰彇鏃堕暱
+ decimal.TryParse(currentRow["hour"]?.ToString(), out hour);
+
+ // 鎵归噺璁剧疆涓嬮潰鎵�鏈夎鐨勬椂闀�
+ for (int i = focusedRowHandle + 1; i < gridView2.DataRowCount; i++)
+ {
+ var row = gridView2.GetDataRow(i);
+ if (row != null)
+ {
+ row["hour"] = hourValue;
+ // 璁＄畻璁℃椂宸ヨ祫
+ row["salary"] = hourlySalary * hour;
+ }
+ }
+ gridView2.RefreshData();
+ }
+
+ /// <summary>
+ /// 宸ュ崟涓嬫媺妗嗛�夋嫨浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void txt_DAA001_EditValueChanged(object sender, EventArgs e)
+ {
+ SearchLookUpEdit lookupEdit = sender as SearchLookUpEdit;
+ DataRowView selectedDataRow = (DataRowView)lookupEdit.GetSelectedDataRow();
+ if (selectedDataRow != null)
+ {
+ txt_DAAType.Text = selectedDataRow["宸ュ崟绫诲瀷"].ToString();
+ }
+ else
+ {
+ txt_DAAType.Text = "";
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3