Sic-Software
/
Sic10
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
717 Commits 13 Branches 35 Tags 646 MiB
Commit Graph

717 Commits

Author SHA1 Message Date
SL 5b46e867e4 系统配置中增加AllowTraceAOHopping和AllowTraceDIHopping项。 2024-02-26 10:24:57 +08:00
SIC1016\caipeilun 03c078bdd0 默认保养超时时用Info提示 2024-02-26 10:12:16 +08:00
SIC1016\caipeilun bd56d4881c 更新库文件 更新维保默认项 2024-02-26 09:53:37 +08:00
SIC1016\caipeilun 5d54d30d3a 更新库文件 2024-02-23 10:53:36 +08:00
SIC1016\caipeilun 472cb40e00 Merge branch 'feature/维保界面V1.0' into DevelopBase 
# Conflicts:
#	SicRT/Config/System.sccfg
#	SicRT/Instances/ToolLoader.cs
#	SicRT/SicRT.csproj
#	SicUI/Bootstrapper.cs
#	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
#	ThirdParty/MECF.Framework/Sicentury.Core.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
 2024-02-23 10:52:55 +08:00
SIC1016\caipeilun 6dbb9d623b Merge branch 'feature/WCF测试' into DevelopBase 
# 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
 2024-02-23 09:09:12 +08:00
SIC1016\caipeilun e2b7653d56 更新库文件DevelopBase 2024-02-23 09:06:09 +08:00
SIC1016\caipeilun 78582fc288 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic10 into feature/维保界面V1.0 
# Conflicts:
#	SicRT/Properties/AssemblyInfo.cs
#	SicRT/ReleaseNotes.md
#	SicUI/Properties/AssemblyInfo.cs
#	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
#	ThirdParty/MECF.Framework/Sicentury.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
 2024-02-23 09:01:35 +08:00
hanqiangqiang fe7276afe6 1修改仿真中Float类型数据获取属性 
2修改方法名GetAoBufferFloat
3修改IO名称
4使用合并后的dll
 2024-02-22 11:00:24 +08:00
SIC1016\caipeilun 643dacd05e 更新库文件 2024-02-22 10:01:40 +08:00
hanqiangqiang 76aea05399 Merge branch 'develop' into feature/localization 
# 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
#	ThirdParty/MECF.Framework/Sicentury.Core.dll
 2024-02-22 09:57:57 +08:00
hanqiangqiang 9ccf64ca9f PM2 Alarm13 修改为 Warning15 2024-02-22 09:46:11 +08:00
hanqiangqiang ff0129730e PM1 Alarm13 修改为 Warning15 2024-02-22 09:21:12 +08:00
hanqiangqiang ab0a7a9d1d 版本更新至 1.2.10.75 2024-02-22 08:48:37 +08:00
hanqiangqiang 6a580025df 整理PM Device配置的xml格式 2024-02-21 11:09:34 +08:00
hanqiangqiang c02e54dbb9 1PM新增DI-73,AI-26,AI-27点位 
2监控加热带温区AI-26,AI-27超温报警
3增加配置控制报警输出等级
4仿真添加相应点位
 2024-02-21 11:02:19 +08:00
hanqiangqiang 616209684b 修改默认账户配置项 2024-02-20 13:18:21 +08:00
hanqiangqiang f07138b1b8 更新dll，更新汉化 2024-02-20 10:26:59 +08:00
hanqiangqiang aba3e9f478 修改PM加热界面布局 
更新dll，更新汉化内容
 2024-02-20 10:00:10 +08:00
SIC1016\caipeilun 44ec8248ea Merge branch 'develop' into feature/WCF测试 
# 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
 2024-02-20 08:59:59 +08:00
SIC1016\caipeilun 7188603b44 更新库文件 2024-02-20 08:59:35 +08:00
SIC1016\caipeilun 9bcdc71064 更新逻辑 2024-02-19 10:06:46 +08:00
SIC1016\caipeilun 13165c4ffa 更新PMModule的process判断逻辑 2024-02-19 08:44:13 +08:00
SIC1016\caipeilun 031edee5e3 更新 2024-02-18 08:33:30 +08:00
SIC1016\caipeilun e11cf71b9a 更新库文件，修复 数据库文件循环清理功能 2024-02-04 10:18:20 +08:00
SIC1016\caipeilun a9c0f29980 更新库文件 2024-02-04 10:14:38 +08:00
SIC1016\caipeilun bca006ba9e Merge remote-tracking branch 'origin/feature/WCF测试' into feature/WCF测试 
# Conflicts:
#	SicRT/MultiProcess/ProcessCenter/MultiProcessServiceClient.cs
 2024-02-01 18:13:59 +08:00
SIC1016\caipeilun 8ab0519714 更新 2024-02-01 18:11:54 +08:00
hanqiangqiang d9e71d9797 修改时间自动刷新问题 2024-02-01 16:19:12 +08:00
hanqiangqiang 77ff0b679c 1添加时间属性 
2删除多余引用
 2024-02-01 16:00:26 +08:00
HCL 388a2e50ad 1.日志修改 2024-02-01 14:24:06 +08:00
HCL 1a0cd1025a 1.添加TM DO09、DO11、DO13、DO15与DI-31的互锁 2024-02-01 14:23:15 +08:00
hanqiangqiang 87d6405f72 1删除无用using 
2添加返回对象查询功能
 2024-02-01 09:30:11 +08:00
SIC1016\caipeilun 062ce6ee2c client定时发送腔体状态； 
手动Processidle前向服务器请求判断
 2024-01-31 18:13:23 +08:00
hanqiangqiang b3c4acd0b5 修改加热基数累加 2024-01-31 13:50:38 +08:00
hanqiangqiang aa1e661396 DeviceManager删除测试项，模拟在RT中访问服务 2024-01-31 13:45:05 +08:00
hanqiangqiang 70fd69c079 调试服务器逻辑功能 2024-01-31 13:36:17 +08:00
HQQ 3c79392d87 添加RT访问MultiProcessService函数，未实现功能 2024-01-30 22:09:00 +08:00
hanqiangqiang 232231960c 添加PM模块加热实体类 2024-01-30 17:41:08 +08:00
SIC1016\caipeilun 6c04dc230a 新增MultiProcess wcf服务 测试版 2024-01-30 14:37:51 +08:00
SIC1016\caipeilun 74e1b6043e 更新维保界面测试版本V24.1.29.1 2024-01-29 18:15:39 +08:00
hanqiangqiang b890f1c28d 更新dll测试汉化内容 2024-01-29 16:55:48 +08:00
hanqiangqiang 2531bf459c 更新dll测试修改汉化内容 2024-01-25 16:36:53 +08:00
hanqiangqiang 32bbc38ab3 PM Interlock配置中移除DI-33 2024-01-25 13:15:50 +08:00
hanqiangqiang ce566bd2c1 修改测温配置提示内容 2024-01-23 17:09:12 +08:00
hanqiangqiang af0640912c 修改PM1测温配置项节点问题 2024-01-23 16:43:52 +08:00
hanqiangqiang 4999a02be9 更新dll [3998a66]，测试Process历史记录查询 2024-01-16 17:10:01 +08:00
hanqiangqiang afd6cf9af7 修改PM和TM闸板阀，打开和关闭时的检测逻辑 2024-01-15 08:59:10 +08:00
hanqiangqiang c5493e677b 更新dll，测试汉化内容 2024-01-11 14:29:24 +08:00
SIC1016\caipeilun 34a5aa9dce Merge branch 'feature/localization' of http://118.31.5.210:65000/Sic-Software/Sic10 into feature/localization 
# 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
#	ThirdParty/MECF.Framework/Sicentury.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
 2024-01-11 14:01:29 +08:00