From b5834262308402ea928355987b34d1a9a0011374 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 08 九月 2025 23:43:13 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 92 ++++++++++++++++++++++++++++------------------
1 files changed, 56 insertions(+), 36 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index d22a86a..4cdb1bf 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -34,6 +34,8 @@
toolBarMenu1.btnFPiZhunClick += ToolBarMenu1_btnFPiZhunClick;
toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ toolBarMenu1.btnPingZhiClick += ToolBarMenu1_btnPingZhiClick;
+ toolBarMenu1.btnFPingZhiClick += ToolBarMenu1_btnFPingZhiClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -100,6 +102,10 @@
gcMx1.DataSource = _oldTable;
gcMx1.ForceInitialize();
Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ gridView1.BestFitColumns();
}
catch (Exception ex)
{
@@ -147,7 +153,7 @@
this.ucBtnPrint1.btnAllClick += (s, e) =>
{
string rowGuid = lbMxGuid.Text.Trim();
- SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "閲囪喘鍏ュ簱");
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "鐢熶骇閫�鏂�");
string strCodeList = "";
string strAction = "";
frm.UpdateParent += (ss, ee) =>
@@ -193,7 +199,7 @@
Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
}
-
+
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -266,6 +272,25 @@
{
_toolCk(3);
}
+ /// <summary>
+ /// 鍙嶅搧璐�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnPingZhiClick(object sender, EventArgs e)
+ {
+ _toolCk(4);
+ }
+ /// <summary>
+ /// 鍝佽川
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnFPingZhiClick(object sender, EventArgs e)
+ {
+ _toolCk(5);
+ }
+
/// <summary>
/// 瀹℃牳浜嬩欢
/// </summary>
@@ -435,9 +460,21 @@
txt_tbl002.Focus();
return;
}
- if (string.IsNullOrEmpty(txt_tbl005.Text.Trim()))
+ if (txt_tbl005.SelectedIndex <= 0)
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍘熷洜锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨绫诲瀷锛�");
+ txt_tbl005.Focus();
+ return;
+ }
+ if ((txt_tbl005.Text.Trim()=="鑹搧閫�鏂�") && txt_chkOut.Checked)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鑹搧閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛孿n鍙湁浣滀笟涓嶈壇绫诲瀷鎵嶈兘鐢熸垚琛ユ枡鍗曪紝\n 璇锋鏌ワ紒");
+ txt_tbl005.Focus();
+ return;
+ }
+ if ((txt_tbl005.Text.Trim() == "鏉ユ枡涓嶈壇閫�鏂�") && txt_chkOut.Checked)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鏉ユ枡涓嶈壇閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛孿n鍙湁浣滀笟涓嶈壇绫诲瀷鎵嶈兘鐢熸垚琛ユ枡鍗曪紝\n 璇锋鏌ワ紒");
txt_tbl005.Focus();
return;
}
@@ -448,6 +485,7 @@
yy = txt_tbl005.Text.Trim(),//鍘熷洜
inDaaGuid = workId,//宸ュ崟
inOrgId = orgId,//缁勭粐
+ chkOut = (txt_chkOut.Checked ? "1" : "0"),
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -520,7 +558,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.tbl023 in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -584,14 +626,6 @@
gvList.Add(gvMx2);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
_ucGg = "";
- if (txt_tbl005.Text == "鑹搧閫�鏂�")
- {
- this.split99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
- }
- else
- {
- this.split99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
- }
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -708,6 +742,12 @@
case 3:
strMsg = "鍙嶆壒鍑�";
break;
+ case 4:
+ strMsg = "鍝佽川瀹℃牳";
+ break;
+ case 5:
+ strMsg = "鍝佽川鍙嶅鏍�";
+ break;
}
;
toolBarMenu1.guidKey = "";
@@ -720,32 +760,11 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
-
- //濡傛灉鏄鏍革紝璇㈤棶瑕佷笉瑕佺敓鎴愯ˉ鏂檅eg
- string txt_chkOut = "0";
- if (_inFieldValue == 1 && txt_tbl005.Text.Trim() != "鑹搧閫�鏂�")
- {
- var frm = new Frm_MesItemTblShow();
- frm.UpdateParent += (ss, ee) =>
- {
- try
- {
- txt_chkOut = ee.StringSingle;
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message);
- }
- };
- frm.ShowDialog();
- }
- //濡傛灉鏄鏍革紝璇㈤棶瑕佷笉瑕佺敓鎴愯ˉ鏂檈nd
-
var _obj = new
{
guid = rowGuid,
inFieldValue = _inFieldValue,
- chkOut = txt_chkOut
+
};
try
{
@@ -797,7 +816,6 @@
stringBuilder.Append(dym.dicTxt);
}
gvMx1.SetFocusedRowCellValue("tld015", stringBuilder.ToString());
- // this.TextTxt = ;
};
frm.ShowDialog();
}
@@ -808,6 +826,8 @@
{
DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
lbMxGuid.Text = row["tlid"].ToString();
+ if (string.IsNullOrEmpty(lbMxGuid.Text))
+ return;
toolBarMenu1.guidKey = row["tlid"].ToString();
txtWlid.Text = row["tld002"].ToString();
txtWlgg.Text = row["tld004"].ToString();
--
Gitblit v1.9.3