From 70332ced875cd4afaad7c31dc83f863eb1bd1a9f Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 22 十月 2025 09:58:49 +0800
Subject: [PATCH] 排产工单搜索
---
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 113 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 98 insertions(+), 15 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index c16e184..5603fcc 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -1,6 +1,10 @@
锘縰sing DevExpress.XtraBars;
using DevExpress.XtraBars.FluentDesignSystem;
using DevExpress.XtraBars.Navigation;
+using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.TextEditController;
+using DevExpress.XtraLayout;
+using DevExpress.XtraRichEdit.Model;
using DevExpress.XtraTab;
using DevExpress.XtraTab.ViewInfo;
using Gs.DevApp.DevFrm.User;
@@ -14,7 +18,9 @@
using System.Configuration;
using System.Data;
using System.Drawing;
+using System.IO;
using System.Reflection;
+using System.Text;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -25,7 +31,7 @@
/// tab涓存椂閫夐」鍗�
/// </summary>
private static readonly Dictionary<string, XtraTabPage> TabPageDic = new Dictionary<string, XtraTabPage>();
-
+ private string OldorgFids = "";
public FrmMain()
{
InitializeComponent();
@@ -61,6 +67,52 @@
}
}
};
+ GetOrg();
+ barOrg.EditValueChanged += (s, e) =>
+ {
+ if (barOrg.EditValue == null)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佺殑缁勭粐锛�");
+ return;
+ }
+ string _val = barOrg.EditValue.ToString();
+ if (string.IsNullOrEmpty(_val))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佺殑缁勭粐锛�");
+ return;
+ }
+ if (OldorgFids == _val)
+ return;
+ var _obj = new
+ {
+ edtUserGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
+ userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
+ userOrgFids = _val,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "User/SetUserOrg",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ };
+ #region 鍔犱笂搴曢儴鎻愰啋
+ tab.SelectedPageChanged += (s, e) => {
+ string _strForm = e.Page.Tag != null ? e.Page.Tag.ToString() : "鏈煡";
+ toolForm.Text = ("绐椾綋:" + _strForm);
+ };
+ string _webApiUrl = ConfigurationManager.AppSettings["WebApiUrl"];
+ string _autoUpdate = (ConfigurationManager.AppSettings["IsAutoUpdater"]);
+ string _version = ConfigurationManager.AppSettings["Version"];
+ toolVersion.Text = "褰撳墠鐗堟湰:" + _version + ",鏈嶅姟Api:" + _webApiUrl;
+ string _strFont = Gs.DevApp.Properties.Settings.Default.fontSizeName;
+ toolFont.Text = (",瀛椾綋:" + _strFont);
+ #endregion
}
/// <summary>
/// 鏄剧ず鍙抽敭鑿滃崟
@@ -138,7 +190,7 @@
/// </summary>
private void getTree()
{
- toolTime.Text = "鐧诲綍鏃堕棿" + LoginInfoModel.CurrentUser.LoginTime;
+ toolTime.Text = "鐧诲綍鏃堕棿:" + LoginInfoModel.CurrentUser.LoginTime;
var _obj = new
{
userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
@@ -179,6 +231,7 @@
_grp.Style = ElementStyle.Group;
_grp.Text = _dy["name"].ToString();
_grp.Tag = _dy["formPath"].ToString(); //瀛樿矾寰勶紝绫诲悕
+ _grp.AccessibleDescription = _dy["layoutVersion"].ToString();//鐗堥潰
_grp.Click += _grp_Click;
if (gdx == 0)
_grp.Expanded = true;
@@ -196,6 +249,7 @@
_itm.Text = _dy2["name"].ToString();
wdf.SetCaption("鍔犺浇杩涘害:" + _dy2["name"].ToString());
_itm.Tag = _dy2["formPath"].ToString(); //瀛樿矾寰勶紝绫诲悕
+ _itm.AccessibleDescription = _dy2["layoutVersion"].ToString();//鐗堥潰
_itm.Click += _grp_Click;
_grp.Elements.Add(_itm);
if (idx == 0 && tab.TabPages.Count <= 0)
@@ -204,8 +258,11 @@
var tabText = _itm.Text; //褰撳墠閫夐」鍗￠〉Text鏍囬
var newFormName = _itm.Tag.ToString(); //瀛樿矾寰勶紝绫诲悕
var imgIcon = _itm.Image;
+ var layoutVersion = _itm.AccessibleDescription;
AddTabpage(tab, tabPageName, tabText,
- newFormName, imgIcon);
+ newFormName, imgIcon,"", layoutVersion);
+ //绗�0涓紝涓嶄細瑙﹀彂浜嬩欢锛屾墜鍔ㄨ缃�
+ toolForm.Text = ("绐椾綋:" + newFormName+ ",鐗堥潰:" + layoutVersion);
}
idx++;
}
@@ -222,7 +279,6 @@
}
catch (Exception ex)
{
-
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -240,7 +296,8 @@
var tabText = _acd.Text;
var newFormName = _acd.Tag.ToString();
var imgIcon = _acd.Image;
- AddTabpage(tab, tabPageName, tabText, newFormName, imgIcon);
+ string _strLayout = _acd.AccessibleDescription;
+ AddTabpage(tab, tabPageName, tabText, newFormName, imgIcon, "", _strLayout);
}
/// <summary>
@@ -265,7 +322,7 @@
/// <param name="imgIcon">褰撳墠閫夐」鍗′腑鐨勬柊绐椾綋璺緞锛岀被鍚�</param>
/// <param name="InitializeVal">鍒濆鍊硷紝鐢ㄤ簬瀛愮獥浣撲腑璋冪敤鐖剁獥浣撶殑鍊�</param>
public void AddTabpage(XtraTabControl tabControl, string tabPageName,
- string tabText, string newFormName, Image imgIcon, string InitializeVal = "")
+ string tabText, string newFormName, Image imgIcon, string InitializeVal = "", string strLayout = "")
{
if (IsTabpageExsit(tabControl, tabPageName)) return;
var newPage = new XtraTabPage();
@@ -274,6 +331,7 @@
newPage.Tooltip = newPage.Name;
newPage.Appearance.Header.Font = tab.Appearance.Font;
newPage.ImageOptions.Image = imgIcon;
+ newPage.Tag = newFormName + ",鐗堥潰:" + strLayout;
var fm = AddNewForm(newFormName, InitializeVal);
if (fm != null)
{
@@ -301,15 +359,15 @@
{
if (item.Name == name)
{
- //鍚庢潵鍔犱笂锛屼负浜嗛噴鏀剧獥浣撹祫婧恇eg
- //foreach (Control control in item.Controls)
- //{
- // if (control is Form)
- // {
- // Form myForm = control as Form;
- // myForm.Invoke((MethodInvoker)delegate { myForm.Dispose(); }); // 纭繚 UI 绾跨▼瀹夊叏鍦伴噴鏀捐祫婧�
- // }
- //}
+ //2025-08-08鍔犱笂锛屼负浜嗛噴鏀剧獥浣撹祫婧恇eg
+ foreach (Control control in item.Controls)
+ {
+ if (control is Form)
+ {
+ Form myForm = control as Form;
+ myForm.Invoke((MethodInvoker)delegate { myForm.Dispose(); }); // 纭繚 UI 绾跨▼瀹夊叏鍦伴噴鏀捐祫婧�
+ }
+ }
//鍚庢潵鍔犱笂锛屼负浜嗛噴鏀剧獥浣撹祫婧恊nd
tabControl.TabPages.Remove(item);
item.Dispose();
@@ -448,5 +506,30 @@
}
#endregion
+ private void GetOrg()
+ {
+ string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
+ System.Text.StringBuilder sbSql = new System.Text.StringBuilder();
+ sbSql.Append(" and IS_STATUS=1");
+ sbSql.Append(" and fid in( select org.FID from [dbo].[SYS_USER_BIND] b left join SYS_ORGANIZATION org on b.aboutGuid=org.FID where userGuid='" + LoginInfoModel.CurrentUser.LoginUserGuid + "' and fType='缁勭粐' ) ");
+ var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, sbSql.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
+ var _rtn = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = _rtn.rtnData.list;
+ repositoryItemCheckedComboBoxEdit1.DataSource = dt;
+ repositoryItemCheckedComboBoxEdit1.DisplayMember = "name";
+ repositoryItemCheckedComboBoxEdit1.ValueMember = "fid";
+ var _obj = UtilityHelper.ReturnToDynamic(strReturn);
+ barOrg.EditValue = _obj.rtnData.extendText;
+ OldorgFids = _obj.rtnData.extendText;
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3