gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/gaofei/HJGL_DS

This commit is contained in:
李超 2025-08-18 09:06:10 +08:00
parent def6f87d7d ebff3b731a
commit 7e5b554563
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HJGL_DS/FineUIPro.Web/Web.config
View File

@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/> <FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings> <appSettings>
<!--连接字符串--> <!--连接字符串-->
<add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/> <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<!--系统名称--> <!--系统名称-->
<add key="SystemName" value="诺必达焊接管理系统"/> <add key="SystemName" value="诺必达焊接管理系统"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/> <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

2
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs
View File

@ -248,7 +248,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
Alert.ShowInTop("请选择使用位置！", MessageBoxIcon.Warning); Alert.ShowInTop("请选择使用位置！", MessageBoxIcon.Warning);
return; return;
} }
if (this.drpUsingUnit.SelectedValue == BLL.Const._Null) if (this.drpUsingUnit.SelectedValue == BLL.Const._Null && this.CurrUser.UserId != BLL.Const.GlyId)
{ {
Alert.ShowInTop("请选择使用单位！", MessageBoxIcon.Warning); Alert.ShowInTop("请选择使用单位！", MessageBoxIcon.Warning);
return; return;