rl_mg

root/rl_mg

Fork 0

0b37e66ac8 fix: 与调用mes数据库的问题 liyongde 2023-10-24 15:05:37 +08:00
0a779f2b00 fix: oracle分页查询sql liyongde 2023-10-24 12:21:04 +08:00
6a5a9c68d4 fix: 唛头问题 liyongde 2023-10-24 09:42:36 +08:00
22deece58f rev: 分拣工单、分拣木托盘搬运校验根据计算好的数量 liyongde 2023-10-23 18:30:38 +08:00
ff1c809fd8 fix: 分拣缺空任务 liyongde 2023-10-22 14:55:30 +08:00
957176fd68 fix：json转换错误 liyongde 2023-10-22 14:42:40 +08:00
dd235191a9 fix: 双层输送线搬运规则、点位复位问题、分拣包装下发覆膜机位置 liyongde 2023-10-21 16:45:31 +08:00
5d3bb72266 feat: 修改对接记录存储、打印唛头、码垛剩余反馈 liyongde 2023-10-20 18:25:46 +08:00
16155f87ca feat: 定时同步物料 liyongde 2023-10-20 11:21:54 +08:00
f961f6114e AGV与RGV驱动更新周俊杰 2023-10-19 22:08:47 +08:00
aca6a33ec3 opt: 分拣叫料规则、手持货架盘点、压机搬运 liyongde 2023-10-19 10:51:52 +08:00
0e9840310f fix: 手持：压机搬运、货架盘点、出窑取双层输送线逻辑 liyongde 2023-10-18 10:19:45 +08:00
6a3ed777fa add: 分拣工单根据库存选择物料功能 liyongde 2023-10-16 15:03:29 +08:00
043962f14b fix: mes压机检测新增物料等信息 private String MATERIAL_ID; private String MATERIAL_NAME; private String MATERIAL_SPEC; private String MATERIAL_MODEL; private String MACHINE_WET; liyongde 2023-10-13 14:44:28 +08:00
9fa97946ae opt: 日志打印 liyongde 2023-10-12 16:51:29 +08:00
1b7f6324a4 Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg 周俊杰 2023-10-11 21:07:44 +08:00
051429ebe5 rev 驱动更新周俊杰 2023-10-11 21:07:07 +08:00
9f0c7c6e43 add: 同步货架数据到mes，同步压机检测数据到mes liyongde 2023-10-11 15:40:46 +08:00
f530e9bfe5 fix: 手持功能 liyongde 2023-10-10 15:06:05 +08:00
6fb7a3677d fix: 物料字段追加、分拣判断是否能够继续码垛 liyongde 2023-10-09 09:23:51 +08:00
b302cd3b13 Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-10-08 17:08:39 +08:00
4fcbff9f29 add 增加心跳功能 $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-10-08 17:08:28 +08:00
ca3b2f700d rev: 手持功能接口、看板接口 liyongde 2023-10-08 10:21:23 +08:00
d2894bd7c4 add RGV驱动判断起点和任务失败原因周俊杰 2023-09-27 08:47:46 +08:00
60ddb36318 fix: 修复代码生成器 liyongde 2023-09-26 18:28:45 +08:00
2a7b36edaa fix: mes接口修改 liyongde 2023-09-25 17:52:27 +08:00
d8d9c21be6 fix: mes对接 liyongde 2023-09-20 17:18:53 +08:00
852a705ffb rev: 半条任务与全任务、mes对接的部分日志记录 liyongde 2023-09-16 15:21:05 +08:00
16d96b500f Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg liyongde 2023-09-14 15:07:00 +08:00
774b2d446f add: mes对接出入窑数据 liyongde 2023-09-14 15:06:42 +08:00
9d83010593 Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-14 10:56:51 +08:00
a907c7343e rev $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-14 10:56:16 +08:00
33f10cad62 add lmstoACS日志周俊杰 2023-09-14 10:55:42 +08:00
ac36646c6d rev 配置文件 $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-13 15:37:05 +08:00
add93b3693 rev 更新lucene打印 $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-13 15:33:25 +08:00
5e64c1937f rev:代码更新 ludj 2023-09-13 08:41:51 +08:00
7882eb9907 rev: 压机送料上下分配规则 liyongde 2023-09-12 15:37:04 +08:00
725e32bff3 add: mes对接压机产出数据、lucene日志查询时间排序 liyongde 2023-09-12 14:34:44 +08:00
2f49f62c5d rev 指令生成顺寻周俊杰 2023-09-12 14:26:51 +08:00
6c4b215040 Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-12 09:21:29 +08:00
1cbbc3a974 rev agv交互 $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-12 09:12:45 +08:00
540efe8478 add: mes对接、日志优化 liyongde 2023-09-11 21:20:42 +08:00
673f4dbbb5 add 日志周俊杰 2023-09-11 17:01:57 +08:00
a505ab6de5 rev $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-11 16:55:22 +08:00
fffcf2e84f rev opc $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-11 12:07:36 +08:00
c593bd74f0 REV $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-10 17:31:42 +08:00
a8874188cb rev 驱动更新周俊杰 2023-09-10 17:31:10 +08:00
f5c8c3723b rev 日志 $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-10 09:40:11 +08:00
3947063034 Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg 周俊杰 2023-09-09 14:08:21 +08:00
5958047737 add 混料区条码判断周俊杰 2023-09-09 14:07:40 +08:00
3fb7a3ffb5 rev 模式显示 $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-09 12:25:01 +08:00
1a5e9dcfdf add lucene日志周俊杰 2023-09-08 15:01:53 +08:00
ffa481ae7a Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-07 10:11:27 +08:00
409d569236 rev $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-07 10:10:52 +08:00
28b6555ea8 rev lunce日志周俊杰 2023-09-07 09:18:04 +08:00
a40d8425ad rev $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-04 17:18:04 +08:00
ff90436bc8 rev $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-04 15:33:13 +08:00
433abd04c6 add 包装线周俊杰 2023-09-04 15:31:08 +08:00
c9c87b1ad6 rev $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-04 13:32:54 +08:00
a26ee63253 rev $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-03 10:55:53 +08:00
ecbb66cbe8 add 输送线关联设备周俊杰 2023-09-02 09:51:55 +08:00
5c02ba12aa rev $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-09-01 17:52:55 +08:00
04d1ae0527 add 输送线入口给条码周俊杰 2023-09-01 13:28:18 +08:00
784b72c040 rev 方向 $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-08-31 22:01:57 +08:00
7890f9493b Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg 周俊杰 2023-08-31 13:03:53 +08:00
8d827ef1ee rev 更新下发工单叫料周俊杰 2023-08-31 13:02:46 +08:00
a3a5a1c396 rev $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-08-31 13:00:38 +08:00
812a1ad651 rev $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-08-31 09:56:34 +08:00
f140fa3c7d Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-08-30 15:38:13 +08:00
87120380a2 REV $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-08-30 15:36:22 +08:00
ec1c139c93 AGV日志周俊杰 2023-08-30 14:21:14 +08:00
94a5f4a66d add: 日志管理、mes测试接口、多数据源 liyongde 2023-08-30 14:17:23 +08:00
5fee172f7d 驱动更新周俊杰 2023-08-30 13:19:14 +08:00
7ea40b4f06 rev agv驱动页面 $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-08-30 11:19:00 +08:00
86b4073616 add 增加压机叫料请求 $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-08-29 19:58:30 +08:00
7c7aa7d9de 驱动修改周俊杰 2023-08-29 19:18:52 +08:00
2ba1ee4540 rev: 配置文件 liyongde 2023-08-23 13:42:26 +08:00
76296fa655 fix: 图片不显示问题 liyongde 2023-08-23 11:25:42 +08:00
61dd3569ff rev: 去除载具类型转换 liyongde 2023-08-23 09:14:53 +08:00
df42f09048 fix: 菜单排序 liyongde 2023-08-22 14:49:31 +08:00
2915629084 Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg 周俊杰 2023-08-18 15:03:30 +08:00
c0f08af6a5 add ndc驱动周俊杰 2023-08-18 15:02:45 +08:00
fe4c1b9c81 add udw $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-08-17 18:22:19 +08:00
d4edbbd8e2 rev 修改ndc协程改成驱动 $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-08-17 16:07:02 +08:00
82445e14d5 fix: 通知管理找不到构造方法 liyongde 2023-08-17 15:59:33 +08:00
64f4379468 rev 碟盘机驱动周俊杰 2023-08-17 14:40:20 +08:00
ea50de60ad opt: 错误任务更新 liyongde 2023-08-17 09:34:57 +08:00
e6fccdffd4 fix: 合并冲突 liyongde 2023-08-16 17:15:38 +08:00
40946aa2d6 fix: 异常信息 liyongde 2023-08-16 17:12:04 +08:00
a079dd9058 add 扫码反馈载具号周俊杰 2023-08-16 17:01:35 +08:00
f4376a2c0f Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-08-15 14:20:26 +08:00
7f679435a3 add 驱动、路由自动更新 $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-08-15 14:20:17 +08:00
621d8d80b5 add日志检索单选框.分拣机械手对接位入库周俊杰 2023-08-15 13:47:24 +08:00
fcf87527fc Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-08-15 11:24:00 +08:00
596ec86d1d rev 优化驱动 $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-08-15 11:23:53 +08:00
7180b537fe opt: 对接ACS字段、类名的优化 liyongde 2023-08-15 08:46:42 +08:00
4e2d8b3d35 rev 压机驱动 add码垛关联拆垛周俊杰 2023-08-14 16:02:25 +08:00
c4883efe34 fix: 交互业务 liyongde 2023-08-14 10:11:08 +08:00
05b8c1a7cd rev 更新lms接口 $USER-20220102CG\noblelift$ USER-20220102CG\noblelift 2023-08-14 10:03:22 +08:00
1670f15446 rev 抓取站点修改周俊杰 2023-08-11 17:47:17 +08:00

Commit Graph Select branches Hide Pull Requests master Mono Color

Commit Graph

Select branches

Hide Pull Requests

master