From 0561440e6df330aecd5b0304403f25d6f35dcb00 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 25 八月 2025 16:08:14 +0800
Subject: [PATCH] 用户控件组织过滤
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 2 +-
DevApp/Gs.DevApp/UserControl/UcLookSales.cs | 2 ++
DevApp/Gs.DevApp/UserControl/UcLookSales.Designer.cs | 18 +++++++++---------
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs | 2 +-
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index 938e608..c0c76ee 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -350,7 +350,7 @@
{
gcMain1.DataSource = null;
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and a.FSubsidiary in");
+ _sbSqlWhere.Append(" and a.FSaleOrgId in");
_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
index 83d3ed0..f76faa9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
@@ -109,7 +109,7 @@
{
gcMain1.DataSource = null;
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and xszz.FID in");
+ _sbSqlWhere.Append(" and a.SALE_ORG_ID in");
_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "order_no", "asc", "", _sbSqlWhere.ToString());
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSales.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookSales.Designer.cs
index cc6b945..b8b55fe 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookSales.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSales.Designer.cs
@@ -31,10 +31,10 @@
this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
@@ -75,6 +75,14 @@
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 0;
//
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鍗曟嵁鐘舵��";
+ this.gridColumn8.FieldName = "documentStatusTxt";
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 1;
+ //
// gridColumn4
//
this.gridColumn4.Caption = "瀹㈡埛缂栧彿";
@@ -98,14 +106,6 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 4;
- //
- // gridColumn8
- //
- this.gridColumn8.Caption = "鍗曟嵁鐘舵��";
- this.gridColumn8.FieldName = "documentStatusTxt";
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 1;
//
// gridColumn3
//
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSales.cs b/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
index 747e0a6..d073d98 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
@@ -40,6 +40,8 @@
string _keyWhere = "";
if (!string.IsNullOrEmpty(orgId))
_keyWhere = " and a.SALE_ORG_ID ='" + orgId + "'";
+ _keyWhere+=(" and a.SALE_ORG_ID in");
+ _keyWhere+=(ToolBox.UtilityHelper.GetOrgWhere());
var pgq = new PageQueryModel(1, 999999, "a.bill_no", "asc", "",
" and 1=1" + _keyWhere);
var json = JsonConvert.SerializeObject(pgq);
--
Gitblit v1.9.3