USER-20220102CG\noblelift
|
c7d1367749
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-07-26 16:39:28 +08:00 |
|
USER-20220102CG\noblelift
|
b73c9e8c65
|
更新tlog支持
|
2024-07-26 16:38:50 +08:00 |
|
|
|
2b1ae71936
|
fix: 堆叠行架终点信号确认
|
2024-07-26 11:55:21 +08:00 |
|
|
|
9d432033c7
|
fix: 国际化报错
|
2024-07-26 10:40:07 +08:00 |
|
|
|
cfd1bdba5d
|
fix: 空指针异常
|
2024-07-25 18:52:43 +08:00 |
|
|
|
7ab645a22d
|
fix: 空指针异常
|
2024-07-25 18:35:53 +08:00 |
|
|
|
c312d3071d
|
Merge remote-tracking branch 'origin/master'
|
2024-07-25 16:25:53 +08:00 |
|
|
|
8f49489147
|
fix: 输送线筛掉行架、堆垛机策略开发测试
|
2024-07-25 16:25:24 +08:00 |
|
|
|
c40a00c93d
|
rev:优化废箔称重接口以及新增密集库到插拔轴工位行架任务逻辑
|
2024-07-25 16:00:20 +08:00 |
|
|
|
2237725716
|
fix: 堆垛机策略前段
|
2024-07-25 14:53:39 +08:00 |
|
|
|
98618cbf52
|
fix: 读空指针异常解决阻塞问题
|
2024-07-24 10:01:19 +08:00 |
|
|
|
fd9eef0191
|
fix: 读空指针异常解决阻塞问题
|
2024-07-24 09:01:30 +08:00 |
|
|
|
4a6c1c7af4
|
fix: 多次更新agv状态、阻塞测试
|
2024-07-23 09:06:41 +08:00 |
|
|
|
ccfb246c98
|
add:新增从密集库出气胀轴行架任务
|
2024-07-21 11:28:33 +08:00 |
|
|
|
6babb1980c
|
fix: 日志更新，取消任务和指令、创建人、配置文件线程数搞大
|
2024-07-19 13:26:19 +08:00 |
|
yanps
|
f971c83141
|
opt: 日志优化,依赖版本更新
|
2024-07-16 16:39:34 +08:00 |
|
yanps
|
657e35c51d
|
opt: 打印日志文件优化
|
2024-07-16 16:36:39 +08:00 |
|
|
|
2f104185bb
|
Merge remote-tracking branch 'origin/master'
|
2024-07-16 09:47:04 +08:00 |
|
|
|
467a9c94d1
|
fix: 扫码位报警重新下发plc、异步写lucence
|
2024-07-16 09:46:43 +08:00 |
|
|
|
6f316d1960
|
fix:出库报表
|
2024-07-15 09:51:41 +08:00 |
|
|
|
46bd8c83ee
|
fix:新-出库报表导出
|
2024-07-15 09:09:27 +08:00 |
|
|
|
484cfacee6
|
fix: 扫描码位生成指令优化、内包间优化、写信号优化、lucence注解
|
2024-07-14 17:15:45 +08:00 |
|
|
|
bd0177895e
|
rev:烘箱工序优化
|
2024-07-14 16:52:33 +08:00 |
|
|
|
ab5f7a82eb
|
rev:优化日志
|
2024-07-13 18:13:34 +08:00 |
|
USER-20220102CG\noblelift
|
2e3bbf7bbb
|
rev 更新设备同步默认最大线程数，按照PLC ip数配置线程数
|
2024-07-13 11:19:48 +08:00 |
|
USER-20220102CG\noblelift
|
b43a390a6f
|
rev 优化线程相关
|
2024-07-13 08:35:29 +08:00 |
|
|
|
3b4fdf64dd
|
fix: 单元测试
|
2024-07-11 09:33:48 +08:00 |
|
|
|
600076bc59
|
Merge remote-tracking branch 'origin/master'
|
2024-07-11 08:42:40 +08:00 |
|
|
|
22944ce7ea
|
fix: 堆叠行架修改、日志优化、定时器优化
|
2024-07-11 08:42:17 +08:00 |
|
yanps
|
4b75167f19
|
add: 添加LMS下发信号到西门子称重位
|
2024-07-10 17:52:11 +08:00 |
|
|
|
93c1c11f04
|
rev:出库报表新增原销售订单
|
2024-07-10 08:51:07 +08:00 |
|
|
|
254b4f4a65
|
rev：返检/改切出库回传删除子卷包装关系，成品入库报表新增查询条件
|
2024-07-09 14:42:54 +08:00 |
|
yanps
|
44ed477346
|
opt: 接口日志显示优化
|
2024-07-09 13:40:06 +08:00 |
|
|
|
d652148c1f
|
Merge remote-tracking branch 'origin/master'
|
2024-07-09 13:28:27 +08:00 |
|
|
|
6b82cc7967
|
fix: 异步循环依赖报错
|
2024-07-09 13:28:08 +08:00 |
|
|
|
b38e1152ac
|
add:新增agv交互逻辑
|
2024-07-09 10:29:46 +08:00 |
|
|
|
d9a12ca3df
|
fix: 配置文件修改
|
2024-07-09 08:57:03 +08:00 |
|
|
|
486a7708b1
|
fix: 日志优化，任务指令异步
|
2024-07-09 08:50:30 +08:00 |
|
|
|
da4d4c0352
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv_car/XgAgvCarDeviceDriver.java
|
2024-07-08 17:26:18 +08:00 |
|
yanps
|
050daf64d6
|
opt: 页面国际化,agv货位地址优化
|
2024-07-08 16:58:39 +08:00 |
|
|
|
447c175049
|
fix: 内包间优化
|
2024-07-08 13:44:20 +08:00 |
|
|
|
b64b216e23
|
rev：木箱重量异常通知飞书
|
2024-07-08 08:47:32 +08:00 |
|
|
|
d810379d1e
|
rev:优化测试出现的问题
|
2024-07-06 17:30:10 +08:00 |
|
|
|
4f678392e0
|
Merge remote-tracking branch 'origin/master'
|
2024-07-06 16:20:53 +08:00 |
|
|
|
d1dcf6a200
|
fix: rgv、标准版机械手、定时删除Lucene日志
|
2024-07-06 16:20:32 +08:00 |
|
|
|
c95dc50c49
|
rev:优化测试出现的问题
|
2024-07-04 18:39:47 +08:00 |
|
|
|
54b9140e64
|
Merge remote-tracking branch 'origin/master'
|
2024-07-04 09:58:07 +08:00 |
|
|
|
260e796ac5
|
fix: 手动创建指令修改、日志添加
|
2024-07-04 09:56:48 +08:00 |
|
yanps
|
053fac27f3
|
fix: agv系统显示修改
|
2024-07-03 17:11:02 +08:00 |
|
yanps
|
64dc664ad4
|
opt: 历史任务记录数据显示优化
|
2024-07-03 16:30:23 +08:00 |
|
