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

595 Commits

Author SHA1 Message Date
HCL c08335778b 1.将PLC的无法访问已释放的对象由Alarm改为Info 2023-06-12 09:11:38 +08:00
hanqiangqiang 305b10294a [RT.EquementLibrary] 
1修改表格逻辑
2删除洪膺提出的错误逻辑
 2023-06-11 11:43:41 +08:00
hanqiangqiang 3ad91229b4 [UI.Client] 
删除旧的Coating注册函数
 2023-06-09 17:47:01 +08:00
hanqiangqiang 8d7b6d2298 [UI.Client] 
1Coating数据表，拆分Tray和PM
2添加PM对应的Coating操作功能，添加增改查功能
3优化数据提示
 2023-06-09 17:20:52 +08:00
HCL e6ce2029b2 1.解决PM腔偶尔无法开启的问题 2023-06-09 09:54:29 +08:00
hanqiangqiang 343ad77632 [UI.Client] 
1增加膜厚时，历史数据同步增加BUG修复
2修改提示项，增加提示内容
 2023-06-08 16:48:35 +08:00
hanqiangqiang 49e2bc0394 [RT.EquipmentLibrary] 
修复测温未开启，测温对象为null时，Inner温度读取报错问题
 2023-06-08 14:09:42 +08:00
hanqiangqiang 9e69d02e30 [RT.EquipmentLibrary] 
1测温接口添加三点测温
2上层获取温度时判断是不是三点测温，
 2023-06-07 17:03:45 +08:00
hanqiangqiang d7cfcb19d4 [RT.EquipmentLibrary] 
1添加气体计算系数
2添加PN2流量特殊统计方式
3修改总体积计算方式
 2023-06-07 15:43:10 +08:00
hanqiangqiang 3ae623783b [RT.EquipmentLirary] 
1:按照洪膺要求删除多余数据
2:优数据库查询报错问题
 2023-06-07 08:28:42 +08:00
HCL a38b61609f 1.先删除Ror相关 2023-06-06 14:11:31 +08:00
hanqiangqiang 7397969760 [RT.EquipmentLibrary] 
1完成数据库查询
2完成根据属性和查询结果赋值
 2023-06-05 17:51:20 +08:00
hanqiangqiang ae38c3d707 Merge branch 'develop' into MfcCalculation 2023-06-05 09:22:36 +08:00
HCL a933ddd06f 1.增加磁流体转速大于0时，若电机Enable未开启先开启Enable信号 2023-06-05 08:39:14 +08:00
Mikk 06972ee8b3 [RT.EquipmentLibrary] 
添加IoTCS.cs。
 2023-06-03 14:25:29 +08:00
Mikk 177c0c142c Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic.Framework into develop 2023-06-03 13:32:26 +08:00
hanqiangqiang bba2d3019f 保存后新出现的提交 2023-06-03 13:28:19 +08:00
hanqiangqiang 35816d5e2e 添加漏提交的CS文件 2023-06-03 13:25:05 +08:00
Mikk 9c3d059cd3 [RT.EquipmentLibrary] 
修正IoTC中使用HeaterControlMode枚举约束属性类型后，在DATA中注册该属性，UI端拉取时无法反序列化该类型的问题。
 2023-06-03 13:09:28 +08:00
hanqiangqiang a9b80737c2 添加JobList 2023-06-03 13:01:45 +08:00
hanqiangqiang 6742b3fdd4 Merge branch '测温修改' into develop 2023-06-02 13:22:36 +08:00
hanqiangqiang 90f3bbdea1 库中使用的是三个测温点，合并成兼容，只有8号机上有参数调控测温点数量 2023-06-02 13:22:11 +08:00
HCL ee61c4ad59 1.解决ATM模式下TMRobot和PM不能传盘问题 2023-06-02 09:38:09 +08:00
HCL cb31f1e152 1.解决隔热罩判断下位置代码误写错问题 2023-06-02 09:30:34 +08:00
hanqiangqiang c56c0b533e [RT.EquipmentLibrary] 
一直未连接测温硬件时，初始温度为0，问题修复
 2023-06-01 17:37:00 +08:00
hanqiangqiang dcbaaba27e Merge branch 'develop' into MfcCalculation 2023-06-01 16:19:04 +08:00
hanqiangqiang 2bccbb1dbd Merge remote-tracking branch 'origin/重写Coating功能' into develop 2023-06-01 16:13:05 +08:00
HCL f99aeb2f40 1.电阻检测由Alarm改为Warning 
(cherry picked from commit 3b92255019)
 2023-06-01 15:34:30 +08:00
HCL 3b92255019 1.电阻检测由Alarm改为Warning 2023-06-01 15:09:16 +08:00
Liang Su 16ddf7d365 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic.Framework into develop 2023-06-01 14:33:01 +08:00
hanqiangqiang 581cd62977 还原阀门和MFC到最原始版本 2023-06-01 14:30:14 +08:00
Liang Su 4ea2aae5b5 [RT.EquipmentLibrary] 
整理代码格式。
 2023-06-01 14:29:37 +08:00
Liang Su d62a5ee0e4 [Common] 
更新IoTC，支持PyroAuto和PyroFollow模式。
 2023-06-01 14:29:16 +08:00
hanqiangqiang ebb6e54dae 昂坤DO报警逻辑修改 2023-06-01 14:05:28 +08:00
hanqiangqiang f1ac188b13 从6号机库中移植，关闭或者打开气阀时，操作相关MFC打开或关闭 2023-06-01 13:44:11 +08:00
hanqiangqiang ef99595670 [UI.Client] 
1修改操作数据库属性名称
2修改界面绑定数据源名称
3修正界面，删除测试代码
 2023-06-01 11:53:07 +08:00
hanqiangqiang d6b862b9d4 测试对象打包发送数据 2023-06-01 09:57:24 +08:00
hanqiangqiang d486405ffc [UI.Client] 
1修改多次弹窗问题
[Common]
删除Tray时，Guid信息可能未删除问题修复
 2023-06-01 09:13:20 +08:00
hanqiangqiang 75f71b3eb7 [UI.Client] 
1添加简单ROR界面和基础功能
2添加ROR对象用来传递数据
 2023-05-31 19:39:16 +08:00
hanqiangqiang d302127967 Merge branch 'ROR功能开发' into MfcCalculation 2023-05-31 16:24:24 +08:00
hanqiangqiang dd3d5796b3 临时保存界面 2023-05-31 16:23:56 +08:00
hanqiangqiang 6e136a7f32 Merge branch '重写Coating功能' into ROR功能开发 2023-05-31 16:13:56 +08:00
hanqiangqiang 537c7ddc53 [UI.Client] 
修改Sql语句，属性名称
 2023-05-31 14:43:25 +08:00
hanqiangqiang b50035f5cc Merge branch 'develop' into MfcCalculation 2023-05-31 13:41:31 +08:00
hanqiangqiang 2230955336 Merge branch 'develop' into ROR功能开发 2023-05-31 13:41:16 +08:00
hanqiangqiang ce402674a0 合并到develope后，修改绑定名称 2023-05-31 13:30:41 +08:00
hanqiangqiang 8231c28777 Merge branch '重写Coating功能' into develop 2023-05-31 11:30:17 +08:00
hanqiangqiang 708262ab12 修改背景色 2023-05-31 11:15:54 +08:00
hanqiangqiang 53217d081e 选择夸天查询时，调试出拼接Sql查询语句 2023-05-31 10:29:25 +08:00
hanqiangqiang 7e04bcb543 [UI.Client] 
1:初步美化界面
2:添加鼠标悬浮提示和单选按钮初始值
 2023-05-31 09:41:56 +08:00