Commit Graph

190 Commits

Author SHA1 Message Date
Han Qiang Qiang c27cad4134 临时保存 2024-03-25 14:20:37 +08:00
Han Qiang Qiang 79505e8393 修改TM界面 2024-03-25 13:55:03 +08:00
Han Qiang Qiang 83d6f18305 整理TM界面 2024-03-25 11:24:06 +08:00
Han Qiang Qiang 2b2074297a Merge branch '多片机/动画' into 多片机/multiplate-develop
# Conflicts:
#	SicUI/Controls/Mainframe/M2C4EFEMView.xaml
#	SicUI/Controls/Mainframe/M2C4EFEMView2.xaml
#	SicUI/Models/Operations/Overviews/OverViewViewModel.cs
#	SicUI/SicUI.csproj
#	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-03-25 10:37:12 +08:00
Han Qiang Qiang 62c426e56b 增加MFC配置 2024-03-22 13:22:39 +08:00
Han Qiang Qiang e36b1c4811 Merge branch 'develop' into 多片机/界面管道气路修改 2024-03-22 10:22:30 +08:00
Han Qiang Qiang 54433f5e74 修改PM气路管道 2024-03-22 09:33:53 +08:00
Han Qiang Qiang 1010b35188 修改气路管道图 2024-03-20 13:49:04 +08:00
SIC1016\caipeilun 4bd63462ae 修复overview的汉化遗漏 2024-03-20 11:18:57 +08:00
Han Qiang Qiang 5beb15fd90 修改管道气路图 2024-03-20 09:42:12 +08:00
Han Qiang Qiang dccf0c4183 修改PM管道气路图 2024-03-20 09:35:01 +08:00
SIC1016\caipeilun 966680b6f8 修正OverView中的绑定失败(名称错误/绑定路径错误/未使用该属性等原因) 2024-03-19 18:42:32 +08:00
Han Qiang Qiang 258035acb6 修改PM管道气路图 2024-03-19 16:40:11 +08:00
Han Qiang Qiang 237859c5db 修改PM Heart界面汉化,PSU2绑定数据源 2024-03-19 14:15:30 +08:00
Han Qiang Qiang 0fbdee9ccb 修改PM Motion界面汉化问题 2024-03-19 09:13:00 +08:00
Han Qiang Qiang ff1afae16c 修改PM管道气路图 2024-03-18 14:58:55 +08:00
Han Qiang Qiang 3b09fc3199 修改管道 2024-03-15 16:22:34 +08:00
Han Qiang Qiang 3bdf6e4e0a 修改PM主界面管道气路图 2024-03-15 16:10:42 +08:00
Han Qiang Qiang be68a3de24 修改PM界面管道气路图 2024-03-15 08:45:14 +08:00
Han Qiang Qiang ddb3ff1477 修改PM管道气路图 2024-03-14 17:21:41 +08:00
Han Qiang Qiang c6fab11cd5 修改PM管道气路图 2024-03-14 17:06:55 +08:00
Han Qiang Qiang 0e2d65693a 修改PM主界面气路和管道图 2024-03-14 15:02:53 +08:00
Han Qiang Qiang ba58ed9f55 PM主界面修改气路管道 2024-03-13 16:13:31 +08:00
Han Qiang Qiang 9df228c544 修改气路图 2024-03-13 10:05:37 +08:00
Han Qiang Qiang 6d3b94e792 修改PM气路图 2024-03-13 09:38:21 +08:00
Han Qiang Qiang 0a2a3bb8d8 修改PM管道气路图 2024-03-11 17:38:16 +08:00
Han Qiang Qiang 29c834968b 修改PM管道气路图 2024-03-11 09:48:16 +08:00
Han Qiang Qiang 35ea6b6845 管道气路修改 2024-03-08 13:45:09 +08:00
Han Qiang Qiang 69e41f1ffe Merge branch 'develop' into DevelopBase 2024-03-06 14:04:37 +08:00
Han Qiang Qiang cbdc0f4de5 更新dll [6bb8dec],添加汉化,屏蔽上升沿对温度数据赋值 2024-03-06 14:04:17 +08:00
HCL 8725f56530 1.修改默认值
2.WaferRobot和TrayRobot操作和对应Moudle Online绑定
2024-03-06 09:23:54 +08:00
HCL 34a63c62c4 1.删除无用ModuleWaferList 2024-03-05 10:40:23 +08:00
SIC1016\caipeilun 3a5efd9831 更新版本1.3.0.40229 更新库文件 2024-02-29 09:26:49 +08:00
SIC1016\caipeilun a7455bf1be Merge branch 'DevelopBase' of http://118.31.5.210:65000/Sic-Software/Sic08 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
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
2024-02-28 14:33:07 +08:00
Han Qiang Qiang 4a914ac1ad 添加输入点移动 2024-02-28 14:10:08 +08:00
Han Qiang Qiang 1382f61302 Merge branch 'develop' into feature/localization
# Conflicts:
#	SicUI/Models/Maintenances/TM/EFEMView.xaml
#	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 10:16:49 +08:00
Han Qiang Qiang eaacb3ac4a 1修改PM加热界面
2更新dll,更新汉化内容
3修改新建账户默认配置项
2024-02-20 13:19:48 +08:00
SIC1016\caipeilun c556b86df0 更新测试版24.1.23.1,更新库文件
修改EFEM界面Aligner功能按钮,并能显示相关数据
2024-01-23 13:33:09 +08:00
SIC1016\caipeilun 3b0cd8e2f1 更新EFEM界面,使hw寻边器功能按钮生效 2024-01-22 17:41:30 +08:00
Han Qiang Qiang 0c6a9f13ba 1控件模块是否在线禁用右击菜单和拖拽,修改模块PM1,PM1,Load,UnLoad,添加或逻辑,条件为Rt.Status == "Idle"
2EFEM界面追加此功能
2024-01-19 08:57:24 +08:00
Han Qiang Qiang 7995f7b764 控件模块是否在线禁用右击菜单和拖拽,修改模块PM1,PM1,Load,UnLoad 2024-01-15 17:23:32 +08:00
Han Qiang Qiang b24ca17e69 更新dll测试汉化内容 2024-01-11 14:29:51 +08:00
SIC1016\caipeilun 8805031272 更新库文件 2024-01-11 14:04:23 +08:00
Han Qiang Qiang 4521da4813 Merge branch 'develop' into feature/localization
# Conflicts:
#	Modules/Mainframe/Config/PM/PM1/_ioDefinePM1.xml
#	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/Sicentury.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
2024-01-10 15:25:47 +08:00
Han Qiang Qiang ad802b791a 测试界面菜单汉化 2024-01-10 15:20:21 +08:00
SIC1016\caipeilun 18711c4eb3 Merge branch 'feature/localization' of http://118.31.5.210:65000/Sic-Software/Sic08 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-09 17:47:21 +08:00
SIC1016\caipeilun 6d5a9a013a 修改部分页面未汉化部分 2024-01-09 17:45:01 +08:00
Han Qiang Qiang c500629575 1更新dll,测试汉化
2调整ROR测试界面
2024-01-09 17:26:47 +08:00
SIC1016\caipeilun 1d0f0735dc Merge branch 'feature/localization' of http://118.31.5.210:65000/Sic-Software/Sic08 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-09 15:55:49 +08:00
SIC1016\caipeilun 1a22e28abc datalogviews汉化完成 2024-01-09 15:37:09 +08:00