From 475eadcff3012b2b54d22174e0970f9d24cfa6b4 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 12 九月 2025 17:30:30 +0800
Subject: [PATCH] 1111
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index 52d0e59..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);
@@ -115,14 +117,6 @@
//鎵撳嵃浜嬩欢
this.ucBtnPrint1.btnPrintClick += (s, e) =>
{
-
- if ((txt_tbl013.EditValue.ToString() == "False") )
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇ラ��鏂欑敵璇峰崟鏈鏍镐笉鑳芥墦鍗版潯鐮�");
- txt_tbl013.Focus();
- return;
- }
-
string rowGuid = lbMxGuid.Text.Trim();
ucBtnPrint1.guidKey = rowGuid;
if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
@@ -205,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);
@@ -278,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>
@@ -405,8 +418,7 @@
//2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
txt_tbl023.IsReadly = true;
txt_tbl002.IsReadly = true;
- //txt_tbl005.ReadOnly = true;
- //txt_tbl005.EditValue = true;
+ txt_tbl005.ReadOnly = true;
}
/// <summary>
/// 鏂板浜嬩欢
@@ -448,26 +460,24 @@
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("鑹搧閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛岃妫�鏌ワ紒");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鑹搧閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛孿n鍙湁浣滀笟涓嶈壇绫诲瀷鎵嶈兘鐢熸垚琛ユ枡鍗曪紝\n 璇锋鏌ワ紒");
txt_tbl005.Focus();
return;
}
-
if ((txt_tbl005.Text.Trim() == "鏉ユ枡涓嶈壇閫�鏂�") && txt_chkOut.Checked)
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鏉ユ枡涓嶈壇閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛岃妫�鏌ワ紒");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鏉ユ枡涓嶈壇閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛孿n鍙湁浣滀笟涓嶈壇绫诲瀷鎵嶈兘鐢熸垚琛ユ枡鍗曪紝\n 璇锋鏌ワ紒");
txt_tbl005.Focus();
return;
}
-
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
@@ -548,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
@@ -728,6 +742,12 @@
case 3:
strMsg = "鍙嶆壒鍑�";
break;
+ case 4:
+ strMsg = "鍝佽川瀹℃牳";
+ break;
+ case 5:
+ strMsg = "鍝佽川鍙嶅鏍�";
+ break;
}
;
toolBarMenu1.guidKey = "";
--
Gitblit v1.9.3