From 20d4fc36c96d40b9e90ee0f6f8ca86c5251a2428 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 24 五月 2022 16:49:14 +0800
Subject: [PATCH] 新增了根据配置文件去判断刷卡按钮是否显示
---
WarM/条码打印/Sc_ICMOToBarCode.cs | 8 ++++----
BLL/公用模块/FrmLogin.cs | 11 +++++++++++
Model/obj/x86/Release/Model.csprojAssemblyReference.cache | 0
LMES/obj/x86/Release/LMES.csprojAssemblyReference.cache | 0
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.cs" "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.cs"
index 46aa95d..00253fd 100644
--- "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.cs"
+++ "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.cs"
@@ -266,6 +266,17 @@
lblIPAddress.Text = "IP:" + Pub_Class.ClsPub.IPAddress + " " + Pub_Class.ClsPub.ComputerName;
CheckUseOrgID();
textBox1.Focus();
+ string sCompName = ClsIni.ReadIni("Erp", "HCompName", DBUtility.ClsPub.AppPath + @"/HXErp.ini"); //绯荤粺閰嶇疆鏂囦欢 瀹㈡埛鍚嶇О
+ if (sCompName == "濂ラ偊")
+ {
+ textBox1.Visible = true;
+ button1.Visible = true;
+ }
+ else
+ {
+ textBox1.Visible = false;
+ button1.Visible = false;
+ }
}
//鏍￠獙缁勭粐
diff --git a/LMES/obj/x86/Release/LMES.csprojAssemblyReference.cache b/LMES/obj/x86/Release/LMES.csprojAssemblyReference.cache
index 32472c0..31e9000 100644
--- a/LMES/obj/x86/Release/LMES.csprojAssemblyReference.cache
+++ b/LMES/obj/x86/Release/LMES.csprojAssemblyReference.cache
Binary files differ
diff --git a/Model/obj/x86/Release/Model.csprojAssemblyReference.cache b/Model/obj/x86/Release/Model.csprojAssemblyReference.cache
index 32feef4..3adfee5 100644
--- a/Model/obj/x86/Release/Model.csprojAssemblyReference.cache
+++ b/Model/obj/x86/Release/Model.csprojAssemblyReference.cache
Binary files differ
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
index a2a7f5e..759a957 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Sc_ICMOToBarCode.cs"
@@ -238,7 +238,7 @@
}
else
{
- grdMain.DataSource = DSet.Tables[0].DefaultView;
+ //grdMain.DataSource = DSet.Tables[0].DefaultView;
//鎶婂綋鍓嶅崟鎹甀D 瀛樺埌涓�涓寜閽噷闈� 鍒锋柊鏃舵瘡娆″瓨涓�閬�
if (DSet.Tables[0].Rows.Count > 0)
{
@@ -1757,11 +1757,11 @@
{
Int64 HEmpID = 0;
HEmpID = ClsPub.isLong(txtHEmpID.Tag);
- string HEmpName = "";
- HEmpName = ClsPub.isStrNull(txtHEmpID.Text);
+ //string HEmpName = "";
+ //HEmpName = ClsPub.isStrNull(txtHEmpID.Text);
DAL.ClsGy_Source_View oSource = new DAL.ClsGy_Source_View();
- if (HEmpName != "")
+ if (HEmpID != 0)
{
if (oSource.GetInfoByID(HEmpID))
{
--
Gitblit v1.9.1