Commit Graph

  • 9ece4e9113 add:备件入库 liuxy 2023-09-11 08:52:36 +08:00
  • fb92de15c0 add:手持设备接口开发 liuxy 2023-09-08 14:13:13 +08:00
  • 3f37309e1e add:点检、润滑、保养、维修定时任务 liuxy 2023-09-07 15:41:17 +08:00
  • 2bcc9447a4 add:设备统计分析管理:设备故障分析、维修记录 liuxy 2023-09-07 10:52:04 +08:00
  • 1b42409a01 add:设备润滑管理 liuxy 2023-09-06 18:28:29 +08:00
  • fb5f2518a6 add:设备点检管理 liuxy 2023-09-06 16:49:33 +08:00
  • 18d0c11a69 add:设备点检项目维护、设备润滑项目维护 liuxy 2023-09-06 14:44:56 +08:00
  • 166139ed59 add:增加表:设备点检项目、设备润滑项目 liuxy 2023-09-06 11:25:50 +08:00
  • d0318fef1c add:增加表:设备点检管理、设备润滑管理 liuxy 2023-09-06 11:22:29 +08:00
  • a345d69cba rev:设备维修、报修管理修改 liuxy 2023-09-06 11:07:12 +08:00
  • dbd57d25d1 rev:1.设备档案功能修改2.设备保养功能修改 liuxy 2023-09-05 18:55:58 +08:00
  • a4f0e49a3c rev:部门树修改 liuxy 2023-09-05 10:50:35 +08:00
  • e65153e68e add:1.设备维修管理模块 2.设备保养计划模块 liuxy 2023-09-04 19:01:11 +08:00
  • 3e4ba93a54 add:1.设备维修项目维护 2.设备故障分类维护 3.设备保养项目维护 liuxy 2023-09-04 11:02:38 +08:00
  • 97f23b2b0b no message jiaoliming 2023-09-01 10:33:17 +08:00
  • a25a51efa4 rev :lucene jiaoliming 2023-09-01 10:32:42 +08:00
  • f3e26048f2 rev:设备监控 jiaoliming 2023-09-01 10:32:04 +08:00
  • 1a2dcfc24c add:海柔 jiaoliming 2023-09-01 10:30:34 +08:00
  • 10adfb89f5 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one jiaoliming 2023-09-01 10:27:45 +08:00
  • 53c8103546 Revert "Revert "rev:系统配置,设备监控"" jiaoliming 2023-09-01 10:25:31 +08:00
  • ff22772908 Revert "rev:系统配置,设备监控" jiaoliming 2023-09-01 10:16:13 +08:00
  • 408afd8e01 rev:系统配置,设备监控 jiaoliming 2023-09-01 10:14:18 +08:00
  • 036bdb25d7 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-09-01 10:11:34 +08:00
  • df9fdd85df add:仓库管理 zhangzhiqiang 2023-09-01 10:11:27 +08:00
  • ba52db4d18 add:新增lms业务接口 jiaoliming 2023-09-01 10:10:36 +08:00
  • d7d4341684 rev:指令下发 jiaoliming 2023-09-01 10:08:22 +08:00
  • 4b8d2a7814 rev:lucene jiaoliming 2023-09-01 10:07:22 +08:00
  • 7727ca0699 rev: 刻字机 jiaoliming 2023-09-01 10:06:02 +08:00
  • 57c10fd2fc rev:清洗上料 jiaoliming 2023-09-01 10:05:42 +08:00
  • 99554a6376 rev:包装机 jiaoliming 2023-09-01 10:05:11 +08:00
  • 2ea54295a4 rev:机械手码垛 jiaoliming 2023-09-01 10:04:20 +08:00
  • bb30c8e84c rev:包装机 jiaoliming 2023-09-01 10:03:02 +08:00
  • b20069eaa4 rev:刻字上料 jiaoliming 2023-09-01 10:01:55 +08:00
  • 1f07dab81f rev:装箱机 jiaoliming 2023-09-01 10:01:03 +08:00
  • 01fd8b0d19 rev:清洗上、下料 jiaoliming 2023-09-01 09:58:08 +08:00
  • 79ab3099fa rev:开箱机下发信号 jiaoliming 2023-09-01 09:56:56 +08:00
  • 427a3084a4 add: 三线手持功能 : 半成品入库、半成品出库、空箱出库 liuxy 2023-08-30 18:17:11 +08:00
  • f83dc77f98 rev:成品出库前端校验 liuxy 2023-08-28 10:15:52 +08:00
  • 2d88005fd1 opt:刻字输送线任务下发控制 zhangzhiqiang 2023-08-25 17:22:43 +08:00
  • b10f1d806a opt:刻字输送线任务下发控制 zhangzhiqiang 2023-08-25 16:01:17 +08:00
  • eeb28c7361 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-08-25 15:43:35 +08:00
  • 7b215e061f add:设备运行记录 zhangzhiqiang 2023-08-25 15:43:30 +08:00
  • fe98a98ae0 rev opc读写共用一个server wangs 2023-08-25 13:47:41 +08:00
  • 909766d20e add:半成品出入库导出功能 liuxy 2023-08-24 17:09:51 +08:00
  • 25c51f7c6c add:半成品库添加入库类型 zhangzhiqiang 2023-08-24 14:45:15 +08:00
  • 8da0e84f00 rev:刻字上料方案修改 zhangzhiqiang 2023-08-23 21:56:16 +08:00
  • ed6d5a535d Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-08-23 18:43:22 +08:00
  • 64dcbe1e79 add:添加空框送回按钮 zhangzhiqiang 2023-08-23 18:42:25 +08:00
  • 68d7cca968 rev:大屏改造成mybatis以及代码优化 liuxy 2023-08-23 17:28:02 +08:00
  • b18448e695 add:添加空框送回按钮 zhangzhiqiang 2023-08-23 16:58:13 +08:00
  • 01d96359a6 rev:半成品库存导出修改 zhangzhiqiang 2023-08-23 16:24:18 +08:00
  • 08cc55eb5d Merge branch 'master' into feature/三线需求_818 zhangzhiqiang 2023-08-23 14:18:52 +08:00
  • f5ae3ef903 rev:清洗相关功能优化 zhangzhiqiang 2023-08-23 11:01:29 +08:00
  • cc96dd2031 rev:清洗上料相关修改 zhangzhiqiang 2023-08-22 21:38:24 +08:00
  • 53f318fa8e rev:清洗上料相关修改 zhangzhiqiang 2023-08-22 21:33:19 +08:00
  • 4c6484bc2b Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-08-22 15:05:58 +08:00
  • 60a2138e97 rev:清洗机上料 zhangzhiqiang 2023-08-22 15:05:53 +08:00
  • 87e67df718 rev:海柔半成品下发任务类型 liuxy 2023-08-22 13:38:10 +08:00
  • c71642a66b Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-08-22 13:36:12 +08:00
  • 89fb5d375b opt:修改成品出库优先级 zhangzhiqiang 2023-08-22 13:35:11 +08:00
  • b4d06c541c rev opc读取时不建立新连接 wangs 2023-08-21 18:36:20 +08:00
  • 4ce0359d16 rev:成品出库取消分配校验 zhangzhiqiang 2023-08-21 18:06:00 +08:00
  • 626f7b7aad rev:修改mes zhangzhiqiang 2023-08-20 17:56:56 +08:00
  • 3aaa8b4944 add:数据库 zhangzhiqiang 2023-08-20 17:38:41 +08:00
  • 899431897e add:添加定时任务关闭方法 zhangzhiqiang 2023-08-18 20:08:16 +08:00
  • c05dda3bf4 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-08-18 16:06:53 +08:00
  • 54b6cccf67 apt:输送线任务改成异步调用/刻字空框送回不做点位校验; zhangzhiqiang 2023-08-18 16:06:45 +08:00
  • 908c8ed7c8 rev 更新单工ndc连接 wangs 2023-08-18 16:03:45 +08:00
  • 9f7789abc9 rev: 限制拼盘重量不能大于150kg liuxy 2023-08-18 14:55:50 +08:00
  • 8da0178d04 rev:1.成品出库分配站点设置明细显示 2.成品出库分配查询站点下拉框未锁定的 3.配粉发货区锁定4.新增页面:成品发货区 liuxy 2023-08-18 09:42:00 +08:00
  • 2300b7db66 opt:任务优先级 zhangzhiqiang 2023-08-16 14:25:07 +08:00
  • f23bb88d63 opt:任务优先级 zhangzhiqiang 2023-08-16 11:51:08 +08:00
  • 17fe0e6447 rev 更新测试读、写未关闭链接 USER-20220102CG\noblelift 2023-08-16 10:55:06 +08:00
  • 6a8a9c6e40 rev:个人信息修改 liuxy 2023-08-15 21:07:21 +08:00
  • 02d39afbd5 add:新增包装标签打印 zhangzhiqiang 2023-08-15 20:03:57 +08:00
  • aa54150593 add:三线包装工单 zhangzhiqiang 2023-08-15 19:12:40 +08:00
  • 4bbaa58d36 rev:更新箱记录表 liuxy 2023-08-15 14:23:30 +08:00
  • 60058e963f rev:1.海柔半成品acs与mes接口 2.半成品、成品库存增加单据类型字段 liuxy 2023-08-11 18:56:01 +08:00
  • ac23052354 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-08-11 17:14:54 +08:00
  • 7824c459be rev:刻字上料半成品库存过滤 zhangzhiqiang 2023-08-11 17:14:47 +08:00
  • 29f251f7d9 rev 更新底层写入信号逻辑 USER-20220102CG\noblelift 2023-08-11 16:49:55 +08:00
  • b345ea5757 rev:刻字上料输送线任务顺序 zhangzhiqiang 2023-08-11 16:36:16 +08:00
  • 77795095ba add:成品出库分配页面新增一键设置功能 liuxy 2023-08-10 19:13:06 +08:00
  • ef78cef7d8 rev:导入销售单生成id liuxy 2023-08-10 16:36:14 +08:00
  • 379cfc7179 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one liuxy 2023-08-10 16:35:30 +08:00
  • c433ccde33 rev:导入销售单生成id liuxy 2023-08-10 16:35:12 +08:00
  • dc5031c9fa Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-08-10 16:35:07 +08:00
  • 57e6bebda1 add:添加刻字回流 zhangzhiqiang 2023-08-10 16:35:02 +08:00
  • 81606c082c rev:仓位模糊查询修改、组盘记录:过滤掉相同订单、托盘的组盘记录 liuxy 2023-08-10 15:04:59 +08:00
  • bcbe605342 修改:临时包装区上料 zhangzhiqiang 2023-08-10 14:45:45 +08:00
  • 93fa9f818f rev:成品出库分配设置站点需改为 生成任务和下发任务一起 liuxy 2023-08-10 10:45:47 +08:00
  • 59f002b063 rev:清洗机上料任务 zhangzhiqiang 2023-08-09 22:20:00 +08:00
  • 192561edfe add:一体机包装机叫料功能 zhangzhiqiang 2023-08-09 15:47:37 +08:00
  • ef17d390f7 add:组盘修改删除/包装机新增字段 zhangzhiqiang 2023-08-08 22:06:19 +08:00
  • fdf577f540 Merge remote-tracking branch 'origin/master' zhangzhiqiang 2023-08-08 10:23:57 +08:00
  • bdd1aa57cc add:组盘导入临时新增销售订单 zhangzhiqiang 2023-08-08 10:23:52 +08:00
  • 28a203ca3d add:盘点出库 liuxy 2023-08-07 15:00:38 +08:00
  • 3ace18354f rev:成品入库批量归入 zhangzhiqiang 2023-08-07 09:01:32 +08:00
  • a1b892ff1b add:PC海柔半成品盘点 liuxy 2023-08-04 17:33:33 +08:00
  • 172ec8692c add:添加一体机批量入库/组盘 zhangzhiqiang 2023-08-04 14:23:32 +08:00