From 2a8c7b4e3ebe5691fbbe84d8cf285be3f72b7c30 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 09 十二月 2024 13:38:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs | 101 +++++++++++++++++++++++++++-----------------------
1 files changed, 55 insertions(+), 46 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs b/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs
index cc7f795..d635452 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs
@@ -1,8 +1,8 @@
锘縰sing System;
using System.Collections.Generic;
-using System.Text;
+using System.Data;
+using System.Threading.Tasks;
using System.Windows.Forms;
-using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -11,42 +11,43 @@
{
public partial class SelectCheckDt : DevExpress.XtraEditors.XtraForm
{
- private readonly List<FilterEntity> _filterList =
- new List<FilterEntity>();
-
+ private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesQmCheckitemManager/";
public SelectCheckDt()
{
InitializeComponent();
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1, UtilityHelper.GetPageSize());
- gridView1.IndicatorWidth = 50;
- gridView1.CustomDrawRowIndicator += (s, e) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ btnIn.Click += (s, e) =>
{
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
+ var list = new List<dynamic>();
+ for (var i = 0; i < gridView1.DataRowCount; i++)
+ {
+ var checkBox = gridView1.GetRowCellDisplayText(i, "gvChk");
+ if (checkBox == "Checked")
+ {
+ list.Add(new
+ {
+ guid = gridView1.GetRowCellValue(i, "guid").ToString(),
+ fSubsidiary = gridView1.GetRowCellValue(i, "fSubsidiary").ToString(),
+ id = gridView1.GetRowCellValue(i, "id").ToString(),
+ itemNo = gridView1.GetRowCellValue(i, "itemNo").ToString(),
+ itemName = gridView1.GetRowCellValue(i, "itemName").ToString(),
+ itemModel = gridView1.GetRowCellValue(i, "itemModel").ToString(),
+ });
+ }
+ }
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
+ Close();
};
-
}
- /// <summary>
- /// 鍙屽嚮浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- var rowGuid =
- UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
- if (string.IsNullOrEmpty(rowGuid))
- return;
- var list = new List<string>();
- list.Add(rowGuid);
- UpdateParent?.Invoke(this,
- new UpdateParentEventArgs { StringList = list });
- Close();
-
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Task.Delay(100);
+ getPageList(1);
}
/// <summary>
@@ -61,36 +62,44 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage)
{
- var _sbSqlWhere = new StringBuilder();
- foreach (var itm in _filterList)
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
- itm.fileValue + "'");
- var pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc",
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc",
"", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = UtilityHelper.HttpPost("",
- _webServiceName + "GetListPage", json);
+ var strReturn = UtilityHelper.HttpPost("", "MesItemsManager/GetListSelect", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- var dddd = dd.rtnData.pages; //鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.setTxt();
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
}
catch (Exception ex)
{
--
Gitblit v1.9.3