Sic-Software
/
Sic.Framework-Nanjing-Baishi
4
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
719 Commits 21 Branches 0 Tags 72 MiB
Commit Graph

719 Commits

Author SHA1 Message Date
hanqiangqiang ff64edc20f [Sicentury.Localization] 
添加界面菜单汉化完成
 2024-01-10 15:18:16 +08:00
hanqiangqiang 2f31f4a175 添加视图菜单汉化临时保存 2024-01-10 14:01:28 +08:00
SL a4809b0f2c Merge branch 'develop' into feature/localization 2024-01-10 13:17:24 +08:00
SIC1016\caipeilun f092116056 Merge branch 'feature/localization' of http://118.31.5.210:65000/Sic-Software/Sic.Framework into feature/localization 
# Conflicts:
#	Sicentury.Localization/lang_messagebox.resx
#	Sicentury.Localization/lang_messagebox.zh.resx
 2024-01-09 17:40:11 +08:00
SIC1016\caipeilun 5df7208b51 修正页面未汉化部分 
密码框汉化完成
 2024-01-09 17:38:05 +08:00
hanqiangqiang e8b14d69c2 [Sicentury.Localization] 
1新增Monitor弹窗界面汉化
2添加Process界面汉化部分
 2024-01-09 17:25:55 +08:00
hanqiangqiang 442f62fb57 修改dll引用问题 2024-01-09 16:06:28 +08:00
SIC1016\caipeilun bf51b614be Merge branch 'feature/localization' of http://118.31.5.210:65000/Sic-Software/Sic.Framework into feature/localization 
# Conflicts:
#	Sicentury.Localization/Sicentury.Localization.csproj
#	Sicentury.Localization/lang_common.Designer.cs
#	Sicentury.Localization/lang_common.resx
#	Sicentury.Localization/lang_common.zh.resx
 2024-01-09 15:34:40 +08:00
hanqiangqiang 463549312d [Sicentury.Localization] 
添加锁屏界面汉化
 2024-01-09 15:24:24 +08:00
SIC1016\caipeilun 40be5488ff datalogviews汉化完成 2024-01-09 15:22:51 +08:00
hanqiangqiang 3e426792be [Sicentury.Localization] 
1添加弹窗界面汉化文件
2切换登录界面添加汉化
 2024-01-09 14:32:48 +08:00
hanqiangqiang da7638fd86 [Sicentury.Localization] 
lang_common中添加汉化
 2024-01-09 10:56:02 +08:00
hanqiangqiang 6d703d8cb8 [Sicentury.Localization] 
添加Coating界面汉化
 2024-01-08 16:41:54 +08:00
hanqiangqiang f8e4cd80f5 [Sicentury.Localization] 
添加Config所有页面汉化，新增lang_config资源文件
 2024-01-08 14:36:34 +08:00
SIC1016\caipeilun d2b40f5529 recipe界面汉化完成 2024-01-08 11:28:02 +08:00
hanqiangqiang c519ff651f 修改XML节点丢失 2024-01-05 17:33:58 +08:00
SIC1016\caipeilun 92c10cfc5f Merge branch 'feature/localization' of http://118.31.5.210:65000/Sic-Software/Sic.Framework into feature/localization 
# Conflicts:
#	Sicentury.Localization/Sicentury.Localization.csproj
 2024-01-05 17:28:58 +08:00
SIC1016\caipeilun 2d43fb7980 临时保存 2024-01-05 17:25:03 +08:00
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
SIC1016\caipeilun 24733620c9 新增efem界面语言文件 2024-01-05 11:13:37 +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