From 8366fcbfed5c66fa1fab4f6dba964a3451c24091 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 12 九月 2025 16:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 45 +++++++++++++++------------------------------
1 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index 52d0e59..ef838e6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -1,18 +1,16 @@
-using Gs.DevApp.DevFrm.Rk;
-using Gs.DevApp.DevFrm.Rpt;
-using Gs.DevApp.DevFrm.Work;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
+using Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
-namespace Gs.DevApp.DevFrm
+namespace Gs.DevApp.DevFrm.Rk
{
public partial class Frm_MesItemTbl : DevExpress.XtraEditors.XtraForm
{
@@ -115,14 +113,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()))
@@ -405,8 +395,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,9 +437,9 @@
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;
}
@@ -460,14 +449,6 @@
txt_tbl005.Focus();
return;
}
-
- if ((txt_tbl005.Text.Trim() == "鏉ユ枡涓嶈壇閫�鏂�") && txt_chkOut.Checked)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鏉ユ枡涓嶈壇閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛岃妫�鏌ワ紒");
- txt_tbl005.Focus();
- return;
- }
-
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
@@ -548,7 +529,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
--
Gitblit v1.9.3