hanqiangqiang
|
35e9a1081d
|
添加合并时遗漏内容
|
2024-01-05 17:20:57 +08:00 |
hanqiangqiang
|
9f95bd0427
|
Merge branch 'feature/localization' into 添加汉化
# Conflicts:
# Sicentury.Localization/lang_common.Designer.cs
# Sicentury.Localization/lang_common.resx
# Sicentury.Localization/lang_common.zh.resx
# Sicentury.Localization/lang_terms.Designer.cs
# Sicentury.Localization/lang_terms.resx
# Sicentury.Localization/lang_terms.zh.resx
|
2024-01-05 17:11:22 +08:00 |
hanqiangqiang
|
841db42fc6
|
[Sicentury.Localization]
1完善PM主界面汉化资源文件
2修改Alarm界面报警
3修改Cooling Water用户控件汉化
|
2024-01-05 16:57:38 +08:00 |
SIC1016\caipeilun
|
3c58717db5
|
IO界面标题汉化完成
新增deviceview语言文件
|
2024-01-05 15:05:25 +08:00 |
auvkk
|
c8848e60c9
|
导入Commit 42b498f IO相关对象的优化。
|
2024-01-05 13:44:53 +08:00 |
SIC1016\caipeilun
|
24733620c9
|
新增efem界面语言文件
|
2024-01-05 11:13:37 +08:00 |
SL
|
54034593f5
|
Merge branch 'develop' into feature/high-performance-data-collector
|
2024-01-05 10:16:03 +08:00 |
SIC1016\caipeilun
|
37806e40e0
|
Merge branch 'feature/localization' of http://118.31.5.210:65000/Sic-Software/Sic.Framework into feature/localization
# Conflicts:
# Sicentury.Localization/lang_common.Designer.cs
# Sicentury.Localization/lang_common.resx
# Sicentury.Localization/lang_common.zh.resx
|
2024-01-04 17:33:59 +08:00 |
SIC1016\caipeilun
|
b31fa538f7
|
新增TMView界面汉化条目
|
2024-01-04 17:30:51 +08:00 |
hanqiangqiang
|
cb982b90e7
|
[Sicentury.Localization]
1lang_common新增语言内容
2修改lang_pm_motion语言配置
|
2024-01-04 17:19:44 +08:00 |
SIC1016\caipeilun
|
969759d401
|
Merge branch 'feature/localization' of http://118.31.5.210:65000/Sic-Software/Sic.Framework into feature/localization
|
2024-01-04 15:22:00 +08:00 |
SIC1016\caipeilun
|
d5e860a846
|
lang_common库更新部分常见标签
新增tmview专用库
|
2024-01-04 15:21:29 +08:00 |
hanqiangqiang
|
f98c67a616
|
[Sicentury.Localization]
1添加PM_Heart界面语言文件
2添加PM_Motion界面语言文件
|
2024-01-04 14:57:34 +08:00 |
HCL
|
631a041f25
|
1.HiwinRobotB Place后删除夹爪夹紧动作
|
2023-12-29 08:33:57 +08:00 |
SL
|
bb4a30a469
|
Merge branch 'feature/fix-job-done-buzzer-can-not-off-issue' into develop
|
2023-12-28 16:02:33 +08:00 |
hanqiangqiang
|
e7143ed465
|
[UI.Client]
TV阀用户控件添加复位用的依赖属性
[RT.EquipmentLibrari]
SetTVReset时修改参数解析
|
2023-12-28 10:36:59 +08:00 |
hanqiangqiang
|
a400d95bc5
|
[RT.EquipmentLibrary]
TV阀添加复位操作,上位机按钮按下后,置位DO_TVReset,1秒后复位DO_TVReset
|
2023-12-28 09:38:53 +08:00 |
SL
|
558af89d22
|
修正InterlockManager中的INTLK动作列表正在加载时,其它线程已经开始遍历该列表,导致异常的问题。
优化InterlockManager中的变量名称。
|
2023-12-27 16:13:36 +08:00 |
SL
|
66ddf8b742
|
优化三色灯代码。
三色灯数据交换文件中新增事件名称属性。
|
2023-12-27 15:12:26 +08:00 |
SL
|
0cfe77d1aa
|
修正JobDone蜂鸣器鸣响循环结束后,仍然继续鸣响的问题。
优化三色灯代码。
|
2023-12-27 10:42:19 +08:00 |
HCL
|
163d2ecad0
|
1.IoValve 定时器修改
|
2023-12-22 18:18:58 +08:00 |
HCL
|
880652f099
|
1.蝶阀StopRame改成将计时器停止
|
2023-12-22 10:46:41 +08:00 |
SL
|
a4824c3fc2
|
[Localization]
新增汉化内容。
|
2023-12-21 16:25:55 +08:00 |
SL
|
9abfca2cea
|
[Localization]
新增汉化内容。
|
2023-12-21 15:38:24 +08:00 |
SL
|
1598f1cf69
|
[Localization]
增加汉化信息。
|
2023-12-20 17:38:54 +08:00 |
SL
|
036c07bf18
|
[Localization]
增加汉化信息。
|
2023-12-20 17:20:46 +08:00 |
SL
|
aa5f5a6f76
|
[UI.Client]
主窗体增加语言切换按钮。
继续追加汉化信息。
|
2023-12-20 16:57:48 +08:00 |
hanqiangqiang
|
1bb929f06e
|
[Common]
ProcessHistory默认显示对象集合,标记不存储到数据库
[UI.Client]
优化PM process取消查询功能
|
2023-12-20 10:34:57 +08:00 |
SL
|
a0fd57e7dd
|
新增Sicentury.Localization工程,用于实现多语言功能。
[UI.Client]
PMProcessView视图增加多语言支持。
|
2023-12-19 18:35:01 +08:00 |
auvkk
|
e45b1a5b75
|
Merge branch 'develop' into feature/io-name-chinese-support
|
2023-12-18 17:30:05 +08:00 |
auvkk
|
13674dc2c8
|
[UI.Client]
UI中的点表支持中文显示。
|
2023-12-18 17:29:57 +08:00 |
auvkk
|
42b498f6a8
|
[Common]
优化IoManager、IOAccssor相关代码。
|
2023-12-18 16:39:16 +08:00 |
hanqiangqiang
|
7846249e97
|
[RT.EquipmentLibrary]
优化Reset,AE设备未启用时调用_connection对象。
|
2023-12-18 13:41:21 +08:00 |
hanqiangqiang
|
9a5bcb715d
|
Merge branch 'feature/测温重构' into develop
|
2023-12-15 16:14:39 +08:00 |
auvkk
|
23cecf8234
|
Merge branch 'develop' into feature/io-name-chinese-support
|
2023-12-15 15:50:32 +08:00 |
hanqiangqiang
|
cbfd459c58
|
Merge branch 'ProcessHistoryData' into feature/测温重构
|
2023-12-15 14:41:46 +08:00 |
hanqiangqiang
|
305b17a72c
|
[UI.Client]
1整理ProcessHistory相关集合属性,定义在DeviceData中
2修改ProcessHistory配置的XML初始化方式
3UI层通过特性标记来获取初始化的展示对象
|
2023-12-15 14:41:33 +08:00 |
hanqiangqiang
|
6c21820b13
|
[UI.Client]
根据机台调试情况,调整ProcessHistoryTestView界面布局
|
2023-12-15 11:18:01 +08:00 |
hanqiangqiang
|
fd1b3ceb3c
|
[UI.Client]
根据机台调试情况,调整ProcessHistoryTestView界面布局
|
2023-12-15 10:53:14 +08:00 |
hanqiangqiang
|
a5620d26da
|
Merge branch 'ProcessHistoryData' into feature/测温重构
|
2023-12-15 10:19:38 +08:00 |
hanqiangqiang
|
3a58e3cc99
|
[UI.Client]
修改ProcessHistoryTestView界面布局
|
2023-12-15 10:11:12 +08:00 |
auvkk
|
e4a31589da
|
[Common]
整理IoManager.cs格式
|
2023-12-15 10:10:23 +08:00 |
hanqiangqiang
|
c84d4abd9a
|
Merge branch 'develop' into ProcessHistoryData
|
2023-12-15 09:43:24 +08:00 |
hanqiangqiang
|
027726a932
|
[RT.EquipmentLibrary]
IoLineHeater中单独注册温度数据存储到数据库
|
2023-12-15 09:39:26 +08:00 |
hanqiangqiang
|
69028b3500
|
[UI.Clietn]
原有ProcessHistory功能,外层文件夹更名加后缀-old
|
2023-12-15 09:22:03 +08:00 |
hanqiangqiang
|
7aa17480e5
|
[Common]
InterlockManager中Monitor扫描忽略翻转时,键值对集合中不包含对象时,continue当前循环
|
2023-12-15 08:53:48 +08:00 |
hanqiangqiang
|
3dbfd9815c
|
Merge branch 'develop' into ProcessHistoryData
|
2023-12-14 16:54:35 +08:00 |
hanqiangqiang
|
42cb3ae6d8
|
[UI.Client]
1修改界面布局
2数据表中无配置属性时,不显示当前配置项
3查询到的数据排序
|
2023-12-14 16:53:43 +08:00 |
hanqiangqiang
|
a13405a12a
|
[UI.Client]
Process界面保存Recipe时,同步XML中PM1和PM2后再保存,确保Recipe配方中PM1 PM2始终统一
|
2023-12-14 11:06:44 +08:00 |
hanqiangqiang
|
5dca0ddb73
|
[RT.EquipmentLibrary]
Offect根据PM来初始化,增加延时启动,
|
2023-12-13 13:40:42 +08:00 |