yangw
/
lj_plc
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 28de46fb64 change - 界面美化 wangsr 2023-09-07 17:27:40 +0800
  • 9f13b74e6d 0907 晚上临时提交 nodyang 2023-09-07 16:56:54 +0800
  • 62bbcfaf91 解决合并冲突 最终正常期望版本 wangsr 2023-09-07 09:22:44 +0800
  • e6ce524df2 0907 nodyang 2023-09-07 08:34:46 +0800
  • 26358bdfbd add - DB2105nodeDevice添加 问题待解决 wangsr 2023-09-06 17:49:58 +0800
  • d8b0eb696d add - 输送监视图完成 点位开始维护 换电脑 wangsr 2023-09-06 16:24:39 +0800
  • 1761df780f Merge branch 'dep0901' into dep nodyang 2023-09-06 09:34:11 +0800
  • 4e0213df1b 榄菊新的管理 nodyang 2023-09-06 09:32:42 +0800
  • c72bd4553b add 重新编辑配方 nodyang 2023-09-06 09:30:07 +0800
  • 142709f84f change - 小料监控图重画完毕 wangsr 2023-09-05 13:26:13 +0800
  • b27477df99 change - 按钮逻辑修改 wangsr 2023-09-04 13:33:52 +0800
  • d48a870f9f 页面整合处理 nodyang 2023-09-01 16:13:32 +0800
  • 53c2b54934 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-08-31 09:26:17 +0800
  • dc45f101bb change - 化工來訪前 wangsr 2023-08-31 09:26:08 +0800
  • a1c9ba3aac 生产计划 nodyang 2023-08-31 08:29:21 +0800
  • 4ad8952ab1 Merge remote-tracking branch 'haiwei/dep' into dep nodyang 2023-08-30 18:44:55 +0800
  • 57880f5e4e 0830 提交 nodyang 2023-08-30 18:44:49 +0800
  • 1667bca306 Revert "测试" wangsr 2023-08-29 19:50:16 +0800
  • 2412c53d6a Revert "change - 菜单装载" wangsr 2023-08-29 19:45:03 +0800
  • deb07e73dc 测试 nodyang 2023-08-29 19:35:43 +0800
  • ed6e1167dc Merge remote-tracking branch 'haiwei/dep' into dep nodyang 2023-08-29 19:30:10 +0800
  • 1c0fbf79e8 重量 参数管理 nodyang 2023-08-29 19:30:04 +0800
  • 5508d3bc2b change - 菜单装载 wangsr 2023-08-29 19:02:01 +0800
  • 1b2f8d16c7 SaveWetMixerReport nodyang 2023-08-29 18:02:50 +0800
  • 9af634d4b3 Fix nodyang 2023-08-29 17:30:43 +0800
  • bbdba86dd4 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-08-29 17:18:43 +0800
  • 0eb4288d01 change - 改名 wangsr 2023-08-29 17:18:35 +0800
  • 18634444a4 fix nodyang 2023-08-29 17:18:02 +0800
  • 8a6fecc6cb Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-08-29 16:58:36 +0800
  • cfa80ec7f3 change - 三通阀逻辑控制完善 wangsr 2023-08-29 16:58:34 +0800
  • 8f5e9f0fc9 fix配方 nodyang 2023-08-29 16:49:53 +0800
  • 927685d010 plc最终版提交经过测试 nodyang 2023-08-29 10:42:17 +0800
  • 5e39f02bd1 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-08-29 10:35:51 +0800
  • e8224d1f53 emrge nodyang 2023-08-29 10:30:23 +0800
  • f3f6e1afc3 add - 添加界面 wangsr 2023-08-29 10:26:47 +0800
  • 2e02aa0483 nodeDevice.xml nodyang 2023-08-29 10:23:43 +0800
  • 6895e8cde4 整理代码 nodyang 2023-08-29 08:45:14 +0800
  • d03d423814 比例阀 nodyang 2023-08-28 16:41:44 +0800
  • 24400a59c9 阀门 nodyang 2023-08-28 16:00:19 +0800
  • dfd2e0c826 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-08-28 15:21:14 +0800
  • 39d8fdd960 change - text limit wangsr 2023-08-28 15:21:12 +0800
  • 440a6da24f 压力管理 nodyang 2023-08-28 15:20:13 +0800
  • 1fb17ee8f0 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-08-28 13:47:48 +0800
  • 4a9cc5c480 change - delete sql change wangsr 2023-08-28 13:47:44 +0800
  • f195102a8a 整理代码 nodyang 2023-08-28 13:45:47 +0800
  • 716d43eaf8 change - 设备压力参数管理维护 wangsr 2023-08-28 10:52:26 +0800
  • 48e1497789 Merge branch 'wangsr' into dep_yangw nodyang 2023-08-28 09:02:07 +0800
  • 6f0a34056e 提交准备合并 wangsr 2023-08-28 09:01:16 +0800
  • 6ee566826c change - PlcCommunication代码优化 wangsr 2023-08-25 17:36:07 +0800
  • 4c853034dd add - 数据块状态检测（差两个struct数据类型） wangsr 2023-08-25 16:46:14 +0800
  • 73320cb736 merge nodyang 2023-08-25 10:20:48 +0800
  • 9b29781643 add - ParameterWithPC部分状态监测 wangsr 2023-08-25 10:14:09 +0800
  • 92bfefa190 add - DB1165状态监测 部分完成 nodeDevice维护 wangsr 2023-08-24 17:38:50 +0800
  • 4eb0084239 add - MotorinitStateMonitor 结束 wangsr 2023-08-24 10:26:03 +0800
  • af10a16d38 add - 8/23下班 添加马达初始化数据块监测类（阶段） wangsr 2023-08-23 17:36:39 +0800
  • b82b87a847 change - 电机初始化状态监测 wangsr 2023-08-23 16:42:37 +0800
  • 8331712550 add - 阀门数据类状态监测 维护nodeDevice wangsr 2023-08-23 10:56:19 +0800
  • a42944f15d change - 榄菊设备参数压力管理 partchange wangsr 2023-08-22 17:35:23 +0800
  • d71c4836b2 doctrl part change wangsr 2023-08-21 15:36:58 +0800
  • 6c0ba7c4db change - 大小写问题 wangsr 2023-08-21 13:36:10 +0800
  • fb572e5a0a Revert "delete - 删除无用压缩包" wangsr 2023-08-21 11:18:21 +0800
  • 49a3f76a21 delete - 删除无用压缩包 wangsr 2023-08-21 09:42:17 +0800
  • f014130acd change - DOControl代码完善 wangsr 2023-08-18 09:08:33 +0800
  • 44b54a1796 小修改 wangsr 2023-08-17 16:35:14 +0800
  • be5c0bc9a1 Revert "change - Timer完善 增加 等待加入多綫程" wangsr 2023-08-17 16:34:11 +0800
  • e06d8c8d68 Merge branch 'dep_yangw' into wangsr wangsr 2023-08-17 16:05:25 +0800
  • e00504ce9a change - Timer完善 增加 等待加入多綫程 wangsr 2023-08-17 16:03:41 +0800
  • 465c348df0 应用类库 nodyang 2023-08-17 16:02:55 +0800
  • 6bc53e73d9 Merge branch 'dep_yangw' into wangsr2 wangsr 2023-08-17 15:09:43 +0800
  • dd9fcefccf 修改plc nodyang 2023-08-17 15:06:30 +0800
  • 2b5fccc5e8 解决合并冲突——wangsr+dep_yangw wangsr 2023-08-17 14:56:43 +0800
  • b19a0c0b27 漏 wangsr 2023-08-17 14:49:59 +0800
  • cc10602c3f Merge branch 'dep_yangw' into wangsr wangsr 2023-08-17 14:49:10 +0800
  • bcdede6928 add - Timer部分引入 wangsr 2023-08-17 14:45:26 +0800
  • b43b08586a add - 阀门数据块监测 - 电机代码待优化 wangsr 2023-08-17 11:29:33 +0800
  • fa6c6e84bc add - 电机数据块状态检测 - 待添加Timer wangsr 2023-08-17 10:35:44 +0800
  • df5758ff0c Merge branch 'dep' into dep_yangw nodyang 2023-08-17 09:39:03 +0800
  • cc80555fdf 最新版本的plc nodeDevice.xml nodyang 2023-08-17 09:37:57 +0800
  • c298569b3f add - Plc数据读取-816下班 wangsr 2023-08-16 17:32:57 +0800
  • 924bdf72db add - 电机调试2（业务偏差） wangsr 2023-08-16 16:07:04 +0800
  • 58cc555f55 change - 超级管理员密码修改 wenjy 2023-08-16 15:14:15 +0800
  • bdd2371ba4 修订Plc nodyang 2023-08-16 14:55:24 +0800
  • d5360fe47c change - office引用修改 wenjy 2023-08-16 14:52:39 +0800
  • da6ba6e358 add - 阀门控制调试 wangsr 2023-08-16 14:18:27 +0800
  • 33807824bd add - 加入简易报警灯控制和部分日志 wangsr 2023-08-15 17:26:38 +0800
  • 61e5d44119 change - PLC电机控制代码完善 wangsr 2023-08-15 11:25:33 +0800
  • 25a475a47f 删除plc nodyang 2023-08-15 08:43:56 +0800
  • acef76c492 add - 电机调试窗口、逻辑、plc连接（待测试优化） wangsr 2023-08-14 17:12:10 +0800
  • 9379b9d227 Merge branch 'wangsr' into dep nodyang 2023-08-14 09:34:59 +0800
  • eed38ad76e Merge branch 'dep_plan' into dep nodyang 2023-08-14 09:09:31 +0800
  • 2c79df191e 代码整理 nodyang 2023-08-14 08:42:42 +0800
  • 10d988c5d7 change - 干混 湿混 糊化 报表均已完成 wangsr 2023-08-11 15:55:34 +0800
  • 45e545a79d record - 新尝试备份 wangsr 2023-08-11 15:17:59 +0800
  • 18eb26b929 - change FinishBatchService类自动存盘处理添加 wangsr 2023-08-11 14:33:44 +0800
  • 1925bef7a6 add - 糊化机报表 初始化 查询 双击加载 导出 湿混机报表些许问题待完善 wangsr 2023-08-11 14:31:38 +0800
  • a3d5f972db 解决冲突 合并 wangsr 2023-08-11 08:59:08 +0800
  • 948bdaf7c4 add - 湿混机报表 - 功能缺陷 wangsr 2023-08-11 08:53:00 +0800
  • 85e2019459 change - 干混机类名修改 wangsr 2023-08-10 14:33:20 +0800
  • 0b0b801b2d change- run运行问题处理 wangsr 2023-08-10 14:27:04 +0800
  • 310c518435 Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep wangsr 2023-08-10 14:13:25 +0800