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

737 Commits

Author SHA1 Message Date
hanqiangqiang 6a144422eb Merge branch 'develop' into feature/localization 
# Conflicts:
#	MECF.Framework.RT.EquipmentLibrary/Devices/IoLineHeater.cs
 2024-02-22 10:31:08 +08:00
hanqiangqiang 18a505cc30 [RT.EquipmentLibrary] 
加热带报警监控，正增加配置项，修改报警逻辑
 2024-02-21 10:59:59 +08:00
hanqiangqiang d91f3c5450 修改汉化内容 
修改Recipe编辑界面漏汉化部分
 2024-02-20 10:18:10 +08:00
SIC1016\caipeilun dc031629ef 修复 数据库循环清理功能不生效的异常： 
1.单独提取数据库循环清理功能为Manager
2.原代码是初始化时判定一次，现改为数据库定期清理，配置后无需重启可生效
 2024-02-04 10:11:26 +08:00
HCL 71d019a00b 1.隔热罩升起时检测TMRobot Extend Enable信号 2024-02-02 14:02:52 +08:00
hanqiangqiang 8271ba7be2 [Sicentury.Localization] 
修改汉化翻译内容
 2024-01-26 16:02:21 +08:00
hanqiangqiang c3a7260fa6 [Sicentury.Localization] 
修改汉化翻译内容
 2024-01-25 15:28:25 +08:00
HCL 0532bbdeb7 1.Robot的状态提示Warning改为Info 2024-01-25 08:42:48 +08:00
SIC1016\caipeilun f8e84c7e8c 修改Aligner响应方式，处理响应内容 2024-01-23 13:28:48 +08:00
SIC1016\caipeilun c2fa939ebf 修改HW寻边器代码，使EFEM中对寻边器的功能按钮生效 2024-01-22 17:36:25 +08:00
hanqiangqiang 3998a663ae [UI.Client] 
修改Process历史数据，查询模板获取方式
 2024-01-16 17:06:10 +08:00
HCL 2d5e1367f9 Merge branch 'feature/Transfer-PN' into develop 2024-01-12 09:13:17 +08:00
SL da148b0c65 [UI.Client] 
修正Operation Log查询窗口中，如果Filter Condition的System选项全部不选时，点击Filter按钮导致界面中的按钮全部被禁用的问题。
 2024-01-11 15:19:40 +08:00
hanqiangqiang 73f9d4741a [Sicentury.Localization] 
修改汉化内容
 2024-01-11 14:28:55 +08:00
SIC1016\caipeilun 7cfd1f22cd Merge branch 'feature/localization' of http://118.31.5.210:65000/Sic-Software/Sic.Framework into feature/localization 
# Conflicts:
#	Sicentury.Localization/lang_terms.resx
#	Sicentury.Localization/lang_terms.zh.resx
 2024-01-11 13:54:22 +08:00
SIC1016\caipeilun da4ecda803 添加部分未汉化内容 2024-01-11 13:49:50 +08:00
hanqiangqiang cf01ee89ff [Sicentury.Localization] 
1修改添加PM界面汉化
 2024-01-11 10:16:00 +08:00
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
HCL 4da3aaffc5 1.进度更新 2024-01-09 17:27:31 +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