From c7bf48f709dbddd7744c2d005686606bc168a88a Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 25 十月 2025 09:13:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
index 5094542..7fc75c9 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
@@ -1,10 +1,8 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Data;
-using System.Windows;
namespace Gs.DevApp.UserControl
{
@@ -17,10 +15,9 @@
searchLookUpEdit1View.OptionsView.ColumnAutoWidth = true;
lookSearchSupplier.EditValueChanged +=
LookSearchSupplier_EditValueChanged;
- getSuppler();
}
- public bool IsReadly { get; set; }
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
@@ -33,9 +30,19 @@
if (EditChanged != null) EditChanged(this, e);
}
- private void getSuppler()
+ public void getSuppler(string orgId, string _dftVale = "", string strWhere = "")
{
- var pgq = new PageQueryModel(1, 999999, "a.FSubsidiary asc,a.departmentcode", "asc", "", " and 1=1");
+ lookSearchSupplier.EditValue = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ if (!string.IsNullOrEmpty(orgId))
+ _sbSqlWhere.Append(" and a.FSubsidiary ='" + orgId + "'");
+ _sbSqlWhere.Append(" and a.FSubsidiary in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ if (!string.IsNullOrEmpty(strWhere))
+ {
+ _sbSqlWhere.Append(" and " + strWhere);
+ }
+ var pgq = new PageQueryModel(1, 999999, "a.FSubsidiary asc,a.departmentcode", "asc", "", " and 1=1" + _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
@@ -47,6 +54,10 @@
lookSearchSupplier.Properties.ValueMember = "departmentid";
lookSearchSupplier.ForceInitialize();
lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+ if (!string.IsNullOrEmpty(_dftVale))
+ SetIdOrCode(_dftVale);
+ else
+ lookSearchSupplier.EditValue = null;
}
catch (Exception ex)
{
@@ -87,8 +98,8 @@
lookSearchSupplier.EditValue = null;
return;
}
- if(!string.IsNullOrEmpty(Code))
- lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
+ if (!string.IsNullOrEmpty(Code))
+ lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
}
--
Gitblit v1.9.3