From ebd8dc093cc83a41aade3fd74857974806ad9298 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 15 十月 2025 17:46:55 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelectAll.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelectAll.cs b/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelectAll.cs
index e93c32f..8cbe102 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelectAll.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelectAll.cs
@@ -10,10 +10,12 @@
public partial class UcWwBlclSelectAll : DevExpress.XtraEditors.XtraForm
{
private readonly string _webServiceName = "WWBlManager/";
+ private string _gysId = "";
+ private string _orgId = "";
/// <summary>
///
/// </summary>
- public UcWwBlclSelectAll()
+ public UcWwBlclSelectAll(string orgId = null, string gysId = null)
{
InitializeComponent();
this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
@@ -23,6 +25,8 @@
this.colChkInt.OptionsFilter.AllowFilter = false;
this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
+ _gysId = gysId;
+ _orgId = orgId;
getPageList(1);
btnIn.Click += (s, e) =>
{
@@ -66,12 +70,21 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
+ var keyWhere = "";
+ if (!string.IsNullOrEmpty(_orgId))
+ {
+ keyWhere += " and i.FSubsidiary = '" + _orgId + "'";
+ }
+ if (!string.IsNullOrEmpty(_gysId))
+ {
+ keyWhere += " and (SUPPLIERID is null or SUPPLIERID='" + _gysId + "') ";
+ }
var _obj = new
{
currentPage = 1,
everyPageSize = 999999,
sortName = "",
- keyWhere = "",
+ keyWhere = keyWhere,
};
var json = JsonConvert.SerializeObject(_obj);
try
--
Gitblit v1.9.3