Commit Graph

751 Commits

Author SHA1 Message Date
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
SIC1016\caipeilun b138097198 完成汉化TM等界面 2024-01-11 13:57:23 +08:00
hanqiangqiang 10d52190b1 1修改PM加热界面控件绑定和显示
2修改PM界面相关汉化
2024-01-11 10:16:56 +08:00
hanqiangqiang 7920766fd5 临时保存PM汉化 2024-01-11 08:36:00 +08:00
SIC1016\caipeilun 9843a8e8aa 添加汉化相关程序集和代码 2024-01-10 15:15:41 +08:00
SL 72e21adc2a 更新库文件a4809b0,修改IoManager相关逻辑。 2024-01-10 13:21:47 +08:00
hanqiangqiang 04fd59b240 修正多次Logout、Login后,UI会变卡顿的问题。 2024-01-09 11:08:16 +08:00
hanqiangqiang 85a2825401 追加跟更新内容 2023-12-28 16:22:50 +08:00
hanqiangqiang 2e43b4aad0 仿真添加DO_TVReset 2023-12-28 16:21:50 +08:00
hanqiangqiang 8ed6c840d1 Merge branch 'TV阀添加Reset' into develop 2023-12-28 16:13:02 +08:00
SL 7b26b5ac59 更新库文件bb4a30a,同步最新develop分支编译版本。
修正发行日志。
2023-12-28 16:12:29 +08:00
hanqiangqiang 92ef20477e 添加DI_ApcButterflyError报警输出 2023-12-28 16:03:57 +08:00
hanqiangqiang 2840a964c1 1.PM添加DO_TVReset,TV阀右键时通过控制DO来进行复位
2.PM主界面添加按钮事件触发TVReset
2023-12-28 15:20:21 +08:00
HCL 5f671c2378 1.增加日志记录 2023-12-28 14:23:16 +08:00
HCL e02f58dcae Merge remote-tracking branch 'origin/feature/fix-job-done-buzzer-not-stop-issue' into develop
# Conflicts:
#	SicRT/ReleaseNotes.md
#	SicUI/Properties/AssemblyInfo.cs
2023-12-28 14:21:33 +08:00
HCL 5ea5b8a4ba 1.隐藏SystemConfig中VaccumPressureBase参数
2.手动Purge各个模块不能修改SystemConfig相关参数值
2023-12-28 09:10:23 +08:00
SL 0b97d91672 更新发型记录和版本号。 2023-12-27 16:39:18 +08:00