|
|
89b2fff3d1
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# ruoyi-admin/src/main/java/com/ruoyi/api/controller/AgvController.java
# ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java
# ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/RequestLogServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/bas/srgvmap/service/impl/RoadCacheServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java
# ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java
# ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java
# ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/queue/srgv/mapper/WcsSrgvQueueMapper.java
# ruoyi-admin/src/main/java/com/ruoyi/queue/srgv/service/impl/WcsSrgvQueueServiceImpl.java
# ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/cdz/PlcCdzRead.java
# ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/srgv/PlcSrgvRead.java
# ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ssj/PlcSsjRead.java
# ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/cdz/CdzThread.java
# ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/srgv/BaseSRgvThread.java
# ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/SsjThread.java
# ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/tsj/TsjThread.java
# ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
# ruoyi-admin/src/main/resources/mapper/queue/WcsSrgvQueueMapper.xml
|
2026-07-24 08:52:43 +08:00 |
|
|
|
72b88ed0e3
|
chore: upload current WCS changes
|
2026-07-24 08:51:41 +08:00 |
|
1009473166@qq.com
|
d98fe2a30c
|
2026.3.19 晚
新增出库到位自动过账
|
2026-03-19 18:44:54 +08:00 |
|
1009473166@qq.com
|
af308d7dc9
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# ruoyi-admin/src/main/java/com/ruoyi/api/controller/AgvController.java
|
2026-03-19 18:20:39 +08:00 |
|
张怡蓉
|
ad9f8d87fd
|
小车
|
2026-03-19 15:08:50 +08:00 |
|
1009473166@qq.com
|
fa9386773f
|
2026.3.18 晚
新增agv获取输送机接口
|
2026-03-18 20:29:00 +08:00 |
|
1009473166@qq.com
|
cafcde4a35
|
2026.3.18
|
2026-03-18 14:26:26 +08:00 |
|
1009473166@qq.com
|
24eaaa2823
|
2026.3.18
|
2026-03-18 14:22:57 +08:00 |
|
猫猫guowen
|
24fb696a67
|
数字孪生：修改输送机入库时到位信号为到位，出库时为空闲
|
2026-03-18 14:13:14 +08:00 |
|
liuhanqing
|
9b008f5fe7
|
现场调度修改
|
2026-03-11 09:02:58 +08:00 |
|
liuhanqing
|
03e30d1db0
|
现场调度修改
|
2026-03-02 08:40:01 +08:00 |
|
liuhanqing
|
9c6c32b7ed
|
现场调度修改
|
2026-02-26 09:46:54 +08:00 |
|
1009473166@qq.com
|
cbc76be62f
|
2026.2.9 小车避让
|
2026-02-09 22:10:59 +08:00 |
|
1009473166@qq.com
|
93da2f1cd0
|
2026.2.9 小车避让
|
2026-02-09 19:20:17 +08:00 |
|
1009473166@qq.com
|
83dc4efd72
|
2026.2.4
|
2026-02-04 15:27:22 +08:00 |
|
liuhanqing
|
5fe90b8bb4
|
修改 ssj tsj srgv cdz的读取调度，监控调度
|
2026-01-05 14:10:56 +08:00 |
|
猫猫guowen
|
f209620cd7
|
修改监控页面样式、添加修改提升机与四向车执行队列
|
2025-12-25 15:41:25 +08:00 |
|
猫猫guowen
|
fcfaf773c0
|
数字孪生后台
|
2025-12-24 13:06:04 +08:00 |
|
猫猫guowen
|
36dfd23b13
|
首页和设备监控页面
|
2025-12-23 15:56:58 +08:00 |
|
猫猫guowen
|
debbcb1915
|
首页和设备监控页面
|
2025-12-23 15:46:56 +08:00 |
|
张怡蓉
|
99d62be9be
|
小车
|
2025-12-04 09:48:59 +08:00 |
|
liuhanqing
|
bd77c1e2b4
|
refactor(schedule): 重构调度线程任务初始化逻辑
- 移除BeanUtil等无关注入工具类
- 使用SpringUtils手动获取依赖服务实例
- 调整设备读取逻辑，从连接判断改为直接加载列表
- 注释掉部分冗余或暂时不用的启动线程代码
- 新增对TSJ、CDZ等设备的支持与初始化配置
- 更新XML映射文件中的SQL查询条件及格式化内容
- 优化SRGV任务中断处理逻辑，增加break语句防止空循环
- 暂时注释实际下发指令方法以避免执行真实操作
|
2025-12-02 16:54:26 +08:00 |
|
liuhanqing
|
7e5b17b3e7
|
Merge remote-tracking branch 'origin/main'
|
2025-12-02 10:42:13 +08:00 |
|
张怡蓉
|
c6d2206ff8
|
小车
|
2025-12-02 10:42:03 +08:00 |
|
liuhanqing
|
ca1231bf2f
|
充电桩调度
|
2025-12-02 10:42:02 +08:00 |
|
张怡蓉
|
02f5ea1fb2
|
小车
|
2025-12-01 14:44:38 +08:00 |
|
张怡蓉
|
7e1fee7d81
|
小车
|
2025-12-01 14:37:51 +08:00 |
|
liuhanqing
|
b832cf2214
|
插入充电历史
|
2025-12-01 13:31:11 +08:00 |
|
liuhanqing
|
d765c0a8cb
|
下发充电任务 断电任务
|
2025-12-01 11:03:48 +08:00 |
|
liuhanqing
|
b484605c9c
|
小车规划路径 如果无最短路径 判断是否是1层去避让点或者出库缓存点
|
2025-12-01 10:17:27 +08:00 |
|
liuhanqing
|
137027254b
|
小车规划路径 如果无最短路径 判断是否是1层去避让点或者出库缓存点
|
2025-12-01 10:17:00 +08:00 |
|
liuhanqing
|
d14b886a7f
|
Merge remote-tracking branch 'origin/main'
|
2025-12-01 09:29:38 +08:00 |
|
liuhanqing
|
1b67ebe5d9
|
生成小车断电任务
|
2025-12-01 09:29:24 +08:00 |
|
张怡蓉
|
21a6d830c2
|
小车
|
2025-11-28 14:58:14 +08:00 |
|
张怡蓉
|
e5e87c1013
|
小车
|
2025-11-28 09:11:51 +08:00 |
|
liuhanqing
|
98fa4a4c2d
|
小车充电任务
|
2025-11-27 17:22:16 +08:00 |
|
liuhanqing
|
2fbf07d555
|
小车下发任务，生成最短路径修改
|
2025-11-27 15:42:57 +08:00 |
|
liuhanqing
|
548f55109a
|
小车调度
|
2025-11-27 15:40:53 +08:00 |
|
张怡蓉
|
ea85539f06
|
小车
|
2025-11-27 10:05:41 +08:00 |
|
liuhanqing
|
7b48d380ef
|
提升机生成放货 取货SRgv队列
|
2025-11-27 08:59:09 +08:00 |
|
liuhanqing
|
b1496199d6
|
提升机生成放货 取货SRgv队列
|
2025-11-26 10:57:42 +08:00 |
|
张怡蓉
|
150af6a5f8
|
输送线
|
2025-11-25 13:55:21 +08:00 |
|
liuhanqing
|
f167b97879
|
提升机调度逻辑修改
|
2025-11-25 11:10:22 +08:00 |
|
张怡蓉
|
e6915aa48c
|
输送线
|
2025-11-25 09:39:54 +08:00 |
|
张怡蓉
|
539a9bac95
|
输送线
|
2025-11-24 14:32:24 +08:00 |
|
liuhanqing
|
fe74caba66
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/srgv/BaseSRgvThread.java
|
2025-11-24 14:25:19 +08:00 |
|
liuhanqing
|
04136d65de
|
小车调度部分代码
|
2025-11-24 14:24:38 +08:00 |
|
张怡蓉
|
7e2d63a0cd
|
输送线
|
2025-11-24 09:01:15 +08:00 |
|
张怡蓉
|
16a7f1e37d
|
输送线
|
2025-11-24 09:01:01 +08:00 |
|
liuhanqing
|
23633601cf
|
小车充电调度初始化
|
2025-11-21 16:49:58 +08:00 |
|
