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

688 Commits

Author SHA1 Message Date
LAPTOP-V3V5DP1T\Han Qiang Qiang b024d389f6 1合并时解决冲突，丢弃真实表数据，现在重新移植真值表界面和数据 
2更新合并后的dll
 2023-06-21 11:06:28 +08:00
HCL e0e66048ec 1.更新Common库 2023-06-20 11:39:53 +08:00
HCL 0aad8d9f23 1:控制V94和V96阀时，对应的控制MFC设置为0 2023-06-20 11:09:36 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 239fff5200 Merge branch 'develop' into MfcCalculation 
# Conflicts:
#	Modules/Mainframe/Config/PM/PM1/DeviceModelPM1.xml
#	SicUI/Models/PMs/PMProcessView.xaml
#	SicUI/Models/PMs/PMProcessViewModel.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-06-20 09:14:39 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 3f1710e308 库中develop内容合并到MfcCalculation，更新dll 2023-06-20 09:07:53 +08:00
Liang Su 6d51c5eaad 更新库文件（Commit 604fdab） 
合并到Develop分支。

SicUI的PMProcess视图使10号机软件视图，并恢复原8号机的流量历史记录查询框。
 2023-06-20 08:52:06 +08:00
Liang Su 5f3b6957d1 更新库文件（Commit 95195e4） 
公共库整理主题样式文件。
Recipe编辑视图移至UI库。
完善Recipe编辑器各项功能。
PMProcess视图使用新的Recipe编辑器控件。
从SicUI中移除Recipe编辑器视图。
 2023-06-19 18:52:48 +08:00
HCL e9c4761e49 1.优化参数一键传盘功能 2023-06-19 13:59:45 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang cc5b2f14cd 1修改真值表逻辑，添加TAM_VentT条件，V43=1 
2更新Dll,气体流量系数设置后实时生效
 2023-06-15 16:53:38 +08:00
HCL 26f56380e7 1.Mfc Ror功能进度更新 2023-06-14 17:40:00 +08:00
HCL 150cd61ae9 1.MfcRor进度提交 2023-06-13 11:23:42 +08:00
HCL 1e784d816d Merge branch 'develop' into ROR功能开发 
# Conflicts:
#	Modules/Mainframe/PMs/RecipeExecutions/PostProcess.cs
#	Modules/Mainframe/PMs/Routines/PMPostTransferRoutine.cs
#	Modules/Mainframe/PMs/Routines/PMToProcessIdleRoutine.cs
#	SicRT/Config/DBModel.sql
#	SicRT/Equipments/Systems/EquipmentManager.cs
#	SicRT/Instances/ToolLoader.cs
#	SicUI/Models/PMs/PMMfcRORView.xaml.cs
#	SicUI/Models/PMs/PMOperationViewModel.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-06-13 10:03:08 +08:00
HCL 1a080eba34 1.MfcRor进度更新 2023-06-13 09:23:22 +08:00
Liang Su 4f2aee6cee 更新库文件（Commit 137b760） 
EquipmentManager中当触发设备报警时，重新使能三色灯的Buzzer。
 2023-06-12 14:43:23 +08:00
HCL 7d9eeae030 1.添加电阻检测时间参数 2023-06-12 14:38:34 +08:00
HCL 93eb100c35 1.Mfc Ror功能进度提交 2023-06-12 14:35:24 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang de94e4c3a6 develop合并到MfcCalculation 2023-06-12 14:27:56 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 011fca9989 1修改PN2真值表 
2修改PN2_Vent特殊绑定
3更新dll，添加PN2特殊处理机制
 2023-06-12 10:18:17 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang c4856a5443 1修改PN2真值表 
2修改PN2_Vent特殊绑定
3更新dll，添加PN2特殊处理机制
 2023-06-12 10:16:36 +08:00
HCL cdac3c26a7 1.消除PLC无法访问已释放的对象Alarm 2023-06-12 09:03:47 +08:00
HCL 8026d7e997 1.解决Process Abort后Process Routine仍在执行的BUG 2023-06-12 08:38:43 +08:00
HCL 41b78c54b9 1.Mfc Ror功能更新 2023-06-09 18:31:58 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 34e72002d5 1拆分Coating数据表，Tray和PM分别使用自己对应的数据表，方便以后扩展功能 
2更新Dll,添加PM对应的数据库操作
 2023-06-09 17:49:00 +08:00
HCL d34cbcada6 1.MfcRor功能Routine和数据库保存完成 2023-06-09 13:15:02 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 5cf59d332b 1修改真实表 
2修改流量显示逻辑
 2023-06-09 10:59:22 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 5be5a9279f 1修改xml配置数据 
2修改绑定
 2023-06-09 09:53:25 +08:00
HCL e028ed351f 1.MfcRor功能进度更新 2023-06-08 17:34:02 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 099946ee2c 删除测试代码 2023-06-08 17:00:04 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang b5098fb7f6 1移植数据库脚本 
2在工艺结束后添加膜厚检测
 2023-06-08 16:52:00 +08:00
HCL 820beda464 1.MfcRor功能进度更新 2023-06-07 17:41:20 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 2d2394bb6d 1移动系统配置，添加缺少的气体系数，删除系数调用 
2添加配置保存配置名称
3优化气体统计界面显示
 2023-06-07 15:45:12 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 0d7689d597 修改ROR界面 2023-06-07 10:10:59 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang f265b41468 1解决Json格式化问题 
2按照洪膺要求删除多余数据(dll)
3界面添加Mol数据量
4优化界面刷新问题
5优数据库查询报错问题(dll)
 2023-06-06 17:48:50 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang f39eb201a2 1修改透明度初始位置和名称 
2显示Offset值
 2023-06-06 17:24:42 +08:00
HCL 8e4e39d384 1.解决LeakCheck查询记录重复问题 2023-06-06 16:01:48 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 31fb31f9dd 修改冲突 2023-06-06 15:18:23 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 8ac219e987 添加初始化Coating 2023-06-06 15:12:57 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang f55ba82072 1未解决数据不能刷新问题 
2添加时间绑定功能
3修改真值表逻辑问题
 2023-06-05 17:55:24 +08:00
HCL 224c1c3f6f 1.更新Ror 2023-06-05 17:30:39 +08:00
HCL 6c6a4596d2 1.更新Common库文件 2023-06-05 14:44:47 +08:00
HCL b8ba550573 1.Ror进度更新 2023-06-05 14:39:23 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 3d11b78566 版本号更新到v1.0.19.30 2023-06-02 11:40:27 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 199ae2bbc4 移植Coating 2023-06-02 11:30:02 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang d069ac9914 修改测温，添加兼容性参数配置 2023-06-02 10:57:44 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang ed09ca887a 修改int float数据类型不兼容 2023-06-02 10:28:20 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 0d47693227 删除久的Coating，修改加热配置项数据类型 
更新DLL
 2023-06-01 16:56:20 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 6c8c5e6053 更新dll添加ROR数据打包功能 2023-06-01 09:59:40 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang c484708885 1修改Json版本 
2更新Dll版本
 2023-06-01 09:52:44 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 03601df028 1添加ror更新测试 2023-05-31 19:41:43 +08:00
LAPTOP-V3V5DP1T\Han Qiang Qiang 9523802b22 Merge branch 'MfcCalculation' into ROR功能开发 2023-05-31 16:19:26 +08:00