Sic-Software
/
Sic08
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Activity
609 Commits 19 Branches 30 Tags 693 MiB
Commit Graph

211 Commits

Author SHA1 Message Date
Han Qiang Qiang ab568df2ec 更新dll， 
添加锁屏界面汉化
 2024-01-09 15:25:02 +08:00
Han Qiang Qiang cc3d758c37 只更新dll，测试登录界面汉化 2024-01-09 14:33:39 +08:00
Han Qiang Qiang f9a1371a81 Editor选项卡RoutineConfig界面添加汉化 2024-01-09 10:57:55 +08:00
Han Qiang Qiang e426ea56f7 汉化库中界面，更新测试dll 2024-01-08 16:42:37 +08:00
Han Qiang Qiang 6c3a9a5077 只更新dll测试 2024-01-08 14:37:18 +08:00
Han Qiang Qiang fb982d4895 更新dll 2024-01-05 17:21:39 +08:00
Han Qiang Qiang 46a198aa40 更新合并dll 2024-01-05 17:09:21 +08:00
Han Qiang Qiang 60318f4877 Merge branch 'feature/localization' into 添加汉化 
# 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-05 17:09:03 +08:00
Han Qiang Qiang 6312608a92 1测试PM界面汉化 
2修改ROR测试界面
3测试Alarm界面汉化
 2024-01-05 17:06:50 +08:00
SIC1016\caipeilun 7390e5aff1 更新TM_Leakcheck汉化界面 2024-01-05 16:23:18 +08:00
SIC1016\caipeilun b3fb33ebe0 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.Core.dll
#	ThirdParty/MECF.Framework/Sicentury.Localization.dll
#	ThirdParty/MECF.Framework/zh/Sicentury.Localization.resources.dll
 2024-01-05 15:08:57 +08:00
SIC1016\caipeilun 020209a51b TM/EFEM/DEVICE/IO界面汉化完成 2024-01-05 15:07:27 +08:00
Han Qiang Qiang 9edbcd092a 修改PM界面汉化， 2024-01-04 17:36:32 +08:00
Han Qiang Qiang d7c56cc43e 更新dll，添加语言配置文件 
修改PM   Motion和Heart语言绑定
 2024-01-04 14:59:26 +08:00
Liang Su 3908bef42b 更新库文件a4824c3，增加汉化内容。 2023-12-21 16:26:59 +08:00
Liang Su b3002ce01f Bootstrapper中增加语言切换的测试程序。 2023-12-20 08:56:17 +08:00
Liang Su b321982975 Merge branch 'Sic8ToSic6' into feature/io-name-chinese-support 2023-12-19 16:30:20 +08:00
Liang Su 9de6e39724 修正CommandLine.dll丢失的问题。 2023-12-19 16:29:57 +08:00
Liang Su 56377b695d Merge branch 'Sic8ToSic6' into feature/io-name-chinese-support 
# 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.Core.dll
 2023-12-19 16:28:48 +08:00
Liang Su 7fe8acc0d6 更新库文件13674dc，优化IoManager及IOAccessor。 
修正AOAccessor和AIAccessor的FloatValue属性，统一使用Value属性获取AO、AI数据。AOAccessor和AIAccessor不再支持short型Value属性。
移除SicRT中的SiemensIoProvider.cs，统一使用RT.EquipmenLibrary中的相关对象。
 2023-12-19 16:25:57 +08:00
Han Qiang Qiang 4923b77709 更新dll [7846249]，优化Reset，AE设备未启用时调用_connection对象。 2023-12-19 14:05:39 +08:00
Han Qiang Qiang c7f25dcecd 合并后使用最新dll [9a5bcb7] 2023-12-15 16:33:54 +08:00
Han Qiang Qiang 71f13ea50c Merge branch 'Sic8ToSic6' into feature/测温重构 
# Conflicts:
#	SicRT/Instances/ToolLoader.cs
#	SicRT/ReleaseNotes.md
#	SicUI/Properties/AssemblyInfo.cs
#	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
 2023-12-15 15:54:46 +08:00
Han Qiang Qiang cd2ebe3907 1更新dll [305b17a]，使用合并后的最新dll，添加ProcessHistory 
2修改ProcessHistory配置的XML初始化解析
 2023-12-15 15:01:32 +08:00
Han Qiang Qiang 093a2b9d91 1更新dll，重新整理ProcessHistory数据 
2修改ProcessHistory配置的XML初始化方式
 2023-12-15 14:47:12 +08:00
Han Qiang Qiang 726e067b19 更新测试版本号 2023-12-15 14:43:12 +08:00
Han Qiang Qiang f8c64c1030 Merge branch 'ProcessHistoryData' into feature/测温重构 
# Conflicts:
#	Modules/Mainframe/SicModules.csproj
#	SicRT/Properties/AssemblyInfo.cs
#	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
 2023-12-15 10:27:01 +08:00
Han Qiang Qiang 017f7de7b5 1更新dll, 
2添加ProcessDeviceItem注册项
 2023-12-15 10:12:12 +08:00
Han Qiang Qiang bf1f37b088 合并后使用最新dll 2023-12-15 09:47:47 +08:00
Han Qiang Qiang 7933292bce Merge branch 'Sic8ToSic6' into ProcessHistoryData 
# 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.Core.dll
 2023-12-15 09:47:21 +08:00
Han Qiang Qiang 9403a242ae 更新dll 
PM2添加ProcessDeviceItemsPM2 XML配置
 2023-12-14 16:56:24 +08:00
Han Qiang Qiang 8c449e46e7 更新dll 
修改配置项单位名称
 2023-12-14 15:32:56 +08:00
Han Qiang Qiang 48e2320b07 更新dll 2023-12-14 08:48:53 +08:00
Han Qiang Qiang a33609de36 测试dll 2023-12-13 16:27:12 +08:00
Han Qiang Qiang 24e299dbe7 更新dll，Offect根据PM来初始化，增加延时启动， 2023-12-13 13:50:03 +08:00
Han Qiang Qiang e7d4c5806a 测试dll 2023-12-13 10:13:16 +08:00
Han Qiang Qiang 2c300de65f 更新dll，优化温度数据在数据库中的注册项 2023-12-12 17:36:44 +08:00
Han Qiang Qiang b08d9fa229 1更新dll,修改测温存储，PLC根据PM是否安装来初始化 
2TM主界面控件可见性，绑定是否安装属性
 2023-12-12 17:03:47 +08:00
Han Qiang Qiang 17e1128fae Merge branch 'Sic8ToSic6' into feature/测温重构 
# Conflicts:
#	SicRT/Properties/AssemblyInfo.cs
#	SicRT/ReleaseNotes.md
#	SicUI/Properties/AssemblyInfo.cs
#	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
 2023-12-12 13:58:34 +08:00
Han Qiang Qiang d2e5fcffc5 整理ProcessHistory配置的XML信息，测试dll 2023-12-11 15:22:57 +08:00
HCL 800e65cdb0 Merge branch 'Sic8ToSic6' into feature/Sunway 
# 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
 2023-12-08 13:41:14 +08:00
Han Qiang Qiang bdabd01b3c Merge branch 'Sic8ToSic6' into 整理机台兼容内容 
# Conflicts:
#	SicRT/ReleaseNotes.md
#	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
 2023-12-08 11:20:20 +08:00
HCL d6336744bb 1.进度修改 2023-12-08 09:30:11 +08:00
HCL 96c3eb2eae 1.Sunway Robot Place和Vac功能 2023-12-07 15:10:55 +08:00
HCL fdea850063 1.完善SunwayRobot Pick 2023-12-07 10:27:01 +08:00
Liang Su 25763c26b6 更新库文件c0337f1，修正和优化Sequence编辑器、Recipe编辑器的一些问题。 
移除MainView中注册的Dialog_Notity事件，修正Recipe编辑器中删除和SaveAs操作后弹出空的Information对话框的问题。
更新发行记录。
 2023-12-06 18:57:13 +08:00
HCL 7a90cd5569 1.PICK功能进度更新 2023-12-06 17:43:23 +08:00
Han Qiang Qiang 74e628354e 1保存Process配置的XML信息 
2更新dll
 2023-12-06 17:24:28 +08:00
HCL ceed0d5f20 1.SunwayRobot Map功能完善 2023-12-06 11:07:10 +08:00
HCL 23be22ae3f 1.测试Home和RQ LOAD指令完成 2023-12-05 15:54:07 +08:00