Sic-Software
/
Sic10
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic10 into develop 

# Conflicts:
#	ThirdParty/MECF.Framework/MECF.Framework.Common.dll
#	ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll
#	ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll
#	ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll
#	ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll
#	ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll
This commit is contained in:
SIC1016\caipeilun 2023-10-18 11:04:15 +08:00
parent d59c068e9b 73a638519d
commit d2d569b2db
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SicRT/Config/System.sccfg
View File

@ -23,6 +23,7 @@
<config default="true" name="RecipeCascadeLoading" visible="false" description="启用瀑布流方式加载Recipe" max="" min="" paramter="" tag="" unit="" type="Bool" />
<config default="false" name="RecipeSaveToDB" description="Recipe文件保存到数据库" max="" min="" paramter="" tag="" unit="" type="Bool" />
<config default="true" name="IsPMHostSignalTower" description="是否使用PM PLC控制三色灯；如果设定为False，则使用TM PLC控制三色灯" max="" min="" paramter="" tag="" unit="" type="Bool" visible="false" />
<config default="false" name="SingleSessionLoginMode" description="是否启用单会话登录模式，即同一个账户同一时间仅允许一个UI登录" max="" min="" paramter="" tag="" unit="" type="Bool" />
<configs name="Scheduler" visible="false">
<config default="15" name="WaitLoadTimeOut" description="Wait Load TimeOut" max="1000" min="1" paramter="" tag="" unit="s" type="Double" visible="false" />

2
SicRT/Properties/AssemblyInfo.cs
View File

@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
[assembly: AssemblyVersion("1.2.3.57")]
[assembly: AssemblyVersion("1.2.4.58")]
[assembly: AssemblyInformationalVersion("手动通用版（无EFEM）")]

10
SicRT/ReleaseNotes.md
View File

@ -4,6 +4,16 @@ Manual-GE 手动通用版（适用无EFEM设备）
------
## Version 1.2.4.58
**2023-10-17**
- Bug修复
- 修正Recipe编辑视图激活时顶部功能按钮可能被禁用的问题
- 新特性
- 新增允许从系统配置中关闭单会话登录模式的功能
## Version 1.2.3.57
**2023-10-14**

2
SicUI/Properties/AssemblyInfo.cs
View File

@ -54,6 +54,6 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.2.3.57")]
[assembly: AssemblyVersion("1.2.4.58")]
[assembly: AssemblyInformationalVersion("手动通用版（无EFEM）")]