From 937fb165a9fadf7f56fb56ccd3c1e2a40564b263 Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期四, 20 十一月 2025 16:19:31 +0800
Subject: [PATCH] 到货条码打印增加检验时间
---
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 3aee6c8..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
@@ -95,12 +101,17 @@
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 + "锛屾湇鍔″湴鍧�:" + _webApiUrl;
+ toolVersion.Text = "褰撳墠鐗堟湰:" + _version + ",鏈嶅姟Api:" + _webApiUrl;
+ string _strFont = Gs.DevApp.Properties.Settings.Default.fontSizeName;
+ toolFont.Text = (",瀛椾綋:" + _strFont);
#endregion
}
/// <summary>
@@ -220,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;
@@ -237,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)
@@ -245,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++;
}
@@ -263,7 +279,6 @@
}
catch (Exception ex)
{
-
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -281,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>
@@ -306,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();
@@ -315,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)
{
@@ -492,9 +509,9 @@
private void GetOrg()
{
string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
- System.Text.StringBuilder sbSql= new System.Text.StringBuilder();
+ 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='缁勭粐' ) ");
+ 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
--
Gitblit v1.9.3