From b94097020bf79e3d5f046ac4fbd3c05efcda30b3 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 03 十二月 2024 15:16:27 +0800
Subject: [PATCH] 删除了用户空间的id
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | 112 +++++++++++++++++++++++--------------------------------
1 files changed, 47 insertions(+), 65 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
index 4fd9b84..bbd6949 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -1,12 +1,13 @@
-using DevExpress.RichEdit.Export;
using Gs.DevApp.DevFrm.QC.Models;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
+using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
@@ -32,7 +33,8 @@
{
UtilityHelper.SetCheckIco(s, picCheckBox, this, "status", "");
};
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
@@ -50,10 +52,14 @@
};
_setIno();
}
+ private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ await Task.Delay(100);
+ getPageList(1);
+ }
private void _setIno()
{
- this.txt_itemId.KeyFile = "id";
- this.txt_suppNo.KeyFile = "suppNo";
txt_itemId.EditChanged += (s, e) =>
{
txt_itemNo.Text = this.txt_itemId.GetCode();
@@ -61,30 +67,6 @@
//var ItemName = this.txt_itemId.GetName();
//GetCount(ItemId, ItemName);
};
- }
-
- private int GetCount(string ItemId,string ItemName)
- {
- //string rowGuid = "", rowName = "";
- //(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1);
- //if (string.IsNullOrEmpty(rowGuid))
- //{
- // ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- // return;
- //}
-
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetCount", JsonConvert.SerializeObject(ItemId));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- return _rtn.rtnCode;
-
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- return -1;
- }
}
/// <summary>
/// 鍙屽嚮浜嬩欢
@@ -104,7 +86,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
/// 鏌ヨ浜嬩欢
@@ -113,7 +95,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -125,7 +110,7 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
/// <summary>
@@ -164,7 +149,7 @@
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -181,10 +166,20 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
+
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
+ {
+ _filterList.Clear();
+ if (gridView1.ActiveFilter.Count > 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ }
+ getPageList(1);
+ }
}
/// <summary>
/// 淇敼浜嬩欢
@@ -212,7 +207,6 @@
UtilityHelper.JumpToTab(xtraTabControl1, 1);
lbGuid.Text = "";
UtilityHelper.CleanValueByControl(this.panel1.Controls, true);
-
txt_createBy.Enabled = false;
txt_createDate.Enabled = false;
txt_lastupdateBy.Enabled = false;
@@ -220,7 +214,6 @@
txt_checkUser.Enabled = false;
txt_checkDate.Enabled = false;
txt_status.Enabled = false;
-
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -231,7 +224,7 @@
{
toolBarMenu1.isSetBtn = false;
string _ItemId = txt_itemId.GetId();
- string _suppNo = txt_suppNo.GetId();
+ string _suppNo = txt_suppId.GetId();
if (string.IsNullOrEmpty(_ItemId))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
@@ -241,7 +234,7 @@
if (string.IsNullOrEmpty(_suppNo))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
- txt_suppNo.Focus();
+ txt_suppId.Focus();
return;
}
var _obj = new MesQaMj
@@ -251,19 +244,6 @@
ItemNo = txt_itemId.GetCode(),
SuppId = _suppNo,
};
-
- if (lbGuid.Text.Trim().Length == 0)
- {
- var ItemName = txt_itemNo.Text.Trim();
- var flag = GetCount(_ItemId, ItemName);
- if (flag > 0)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- MsgHelper.Warning("鎻愮ず锛�" + ItemName + "杩欎釜鐗╂枡宸茬粡缁存姢浜嗗厤妫�鏁版嵁");
- return;
- }
- }
-
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
@@ -287,31 +267,32 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private async void getPageList(int curPage)
{
- System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- foreach (FilterEntity itm in _filterList)
- {
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
- }
- PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString());
+ UcLoading _loading = new UcLoading();
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
- string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
+ var strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetListPage", json);
ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- int dddd = dd.rtnData.pages;//鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+ 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.RowsCount = pageSize;//姣忛〉鏄剧ず
- pageBar1.setTxt();
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
}
else
{
@@ -322,6 +303,7 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+ _loading.Stop();
}
/// <summary>
///
--
Gitblit v1.9.3