From cbb5315301b1490b57497212256c5255e5eb7eb6 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 01 十一月 2025 17:06:58 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/UcLookOrg.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs b/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
index 15ef123..0bf33e9 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
@@ -1,10 +1,7 @@
-锘縰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;
@@ -12,6 +9,7 @@
{
public partial class UcLookOrg : DevExpress.XtraEditors.XtraUserControl
{
+
public UcLookOrg()
{
InitializeComponent();
@@ -22,7 +20,7 @@
}
- public bool IsReadly { get; set; }
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
@@ -37,7 +35,10 @@
private void getSuppler()
{
- var pgq = new PageQueryModel(1, 999999, "FID", "asc", "", " and IS_STATUS=1");
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and IS_STATUS=1 and fid in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ var pgq = new PageQueryModel(1, 999999, "fNumber", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
@@ -82,12 +83,13 @@
public void SetIdOrCode(string Code)
{
- if (Code == "-1")
+ if (Code == "-1" || string.IsNullOrEmpty(Code))
{
lookSearchSupplier.EditValue = null;
return;
}
- lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
+ //lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
+ lookSearchSupplier.EditValue = (((Code.ToString().Trim())));
}
--
Gitblit v1.9.3