Commit Graph

170 Commits (e1342383fb9dec80ff841d33c023a8b3c57e01b2)

Author SHA1 Message Date
nodyang e1342383fb 0915 替换plc
wangsr d9980be420 合并
wangsr 67ab37d415 Add - LJPlanning-TestAction等待实装
wangsr 65848c2175 add - 添加计划状态下拉框 数据库变更
wangsr 6e98ca3d4c Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 37fcb77890 change - 计划配方新增查询功能
nodyang 8a021e197c 采用胡工 替换西门子
nodyang 33cde15530 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
nodyang 9c5ad7a7c5 准备继承 hsl
nodyang 6eaee007f6 Demo
nodyang af59930b1b ok
nodyang f2fe90ef1a freesql
nodyang c9087e86de 添加数据访问
wangsr a62b3fc913 change - yw保存报表界面美化
nodyang cd50514e00 修复按钮
wangsr f926545355 change - 修改nodedevice 完善设备监控图 发版前准备
wangsr 63eab8ca08 add - 设备监控界面添加报警
wangsr 37e66a188d add - 报表plchelper数据读取废案
nodyang 94101f3a1d 后台运行
nodyang 55a9a78539 0913 整理代码
nodyang 7e71fd990b 2107 add 新增数据库2107
nodyang a5e0b1e767 0912 测试计划的版本呢
wangsr 8942b48b85 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
wangsr 918040618a change - 中横线改下划线
nodyang d14fa8de9d demo
nodyang aeab567cc7 修补缺失的点位
nodyang 9fbf00b15f mege
nodyang 1f0c2da3d3 Merge branch 'dep_yw0907' of http://175.27.215.92:3000/yangw/lj_plc into dep_yw0907
nodyang 7848b05546 merge
wangsr 28de46fb64 change - 界面美化
nodyang 9f13b74e6d 0907 晚上临时提交
wangsr 62bbcfaf91 解决合并冲突 最终正常期望版本
nodyang e6ce524df2 0907
wangsr d8b0eb696d add - 输送监视图完成 点位开始维护 换电脑
nodyang 1761df780f Merge branch 'dep0901' into dep
nodyang 4e0213df1b 榄菊新的管理
nodyang c72bd4553b add 重新编辑配方
wangsr b27477df99 change - 按钮逻辑修改
nodyang d48a870f9f 页面整合处理
nodyang a1c9ba3aac 生产计划
nodyang 57880f5e4e 0830 提交
nodyang 1c0fbf79e8 重量 参数管理
nodyang 1b2f8d16c7 SaveWetMixerReport
nodyang 9af634d4b3 Fix
wangsr bbdba86dd4 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr 0eb4288d01 change - 改名
nodyang 18634444a4 fix
wangsr 8a6fecc6cb Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep
wangsr cfa80ec7f3 change - 三通阀逻辑控制完善
nodyang 8f5e9f0fc9 fix配方