From 63dd8bdd72afc4e8277606932999e598a13dd04e Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 08 八月 2025 10:09:59 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/SelectHz.cs | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/SelectHz.cs b/DevApp/Gs.DevApp/UserControl/SelectHz.cs
index 9c61660..4812307 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectHz.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectHz.cs
@@ -1,15 +1,9 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
@@ -51,7 +45,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, 999999, "FID", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
@@ -137,7 +131,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageListGys(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.supp_no",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
@@ -177,7 +171,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageListCus(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.cust_no",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
--
Gitblit v1.9.3