zhouz
|
1971e6ced2
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-16 09:37:59 +08:00 |
|
zhouz
|
68f1aef4b0
|
fix:空木箱入库增加高度限制
|
2024-05-16 09:37:54 +08:00 |
|
|
|
2873820eb0
|
opt:获取纸管长度
|
2024-05-15 21:20:40 +08:00 |
|
zhouz
|
10f431ca71
|
fix:入库新增高度要求
|
2024-05-15 20:26:02 +08:00 |
|
|
|
8eb06a6dcc
|
opt:获取纸管长度
|
2024-05-15 19:50:31 +08:00 |
|
|
|
070946f905
|
opt:获取纸管长度
|
2024-05-15 19:49:41 +08:00 |
|
|
|
e6b3461cd9
|
opt:子卷装箱测试
|
2024-05-15 19:19:58 +08:00 |
|
|
|
32549c4b06
|
fix: 推送名称修改测试
|
2024-05-15 18:51:55 +08:00 |
|
|
|
5bfc0ab874
|
Merge remote-tracking branch 'origin/master'
|
2024-05-15 16:17:14 +08:00 |
|
|
|
7a761e6577
|
fix: 联调木箱入库
|
2024-05-15 15:36:15 +08:00 |
|
|
|
92105c1cb3
|
rev：1.出库任务优化：任务完成后更新仓位、库存等信息，单据完成后则根据情况更新库存，情况1：虚拟库，完成单据更新虚拟区仓位、库存，情况2：超期发货：如果子卷超期且是超期发货则更新库存、仓位信息。2.移库任务下发优化：判断是从左边开始移库还是右边开始移库修改
|
2024-05-15 14:01:47 +08:00 |
|
yanps
|
34a84e5bb6
|
opt: 监控页面设备信息显示优化
|
2024-05-15 11:21:23 +08:00 |
|
|
|
cf60ace60f
|
fix: 角色权限分配不显示
|
2024-05-15 09:37:11 +08:00 |
|
zhouz
|
f4e308a50f
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-15 09:08:04 +08:00 |
|
zhouz
|
8ee4fb2f2d
|
fix:空托盘入库修改
|
2024-05-15 09:07:59 +08:00 |
|
|
|
68b6ddb793
|
opt:子卷装箱测试
|
2024-05-14 22:49:10 +08:00 |
|
|
|
1a0e0fe86c
|
fix: 堆垛机异常报警重新下发
|
2024-05-14 20:20:19 +08:00 |
|
yanps
|
00d823ccd3
|
opt: 监控大屏显示设备信息优化
|
2024-05-14 19:56:50 +08:00 |
|
USER-20220102CG\noblelift
|
4741f9952d
|
rev 更新线程
|
2024-05-14 18:30:15 +08:00 |
|
zhouz
|
324d05fd5e
|
fix;新增载具类型
|
2024-05-14 16:03:07 +08:00 |
|
yanps
|
4c5642c001
|
opt: 信号线程还原
|
2024-05-14 15:39:05 +08:00 |
|
|
|
c7490d35f8
|
fix: lms联调修改
|
2024-05-14 15:10:32 +08:00 |
|
zhouz
|
48ba755ad9
|
fix:出入库任务类型给托盘类型，空木箱出库返回木箱号
|
2024-05-14 15:04:44 +08:00 |
|
yanps
|
4df8527bb4
|
opt: 历史任务记录显示起点2终点2,监控大屏2秒刷新
|
2024-05-14 09:00:00 +08:00 |
|
zhouz
|
ad7c2ddd03
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-13 20:05:00 +08:00 |
|
zhouz
|
ec6a0553d4
|
fix:任务下发ACS增加托盘类型，新增空木箱入库的业务逻辑
|
2024-05-13 20:04:55 +08:00 |
|
|
|
9bbe7c8b68
|
rev:更新设备监控刷新时间
|
2024-05-13 19:10:34 +08:00 |
|
USER-20220102CG\noblelift
|
afc6f0de94
|
合并代码
|
2024-05-13 15:14:20 +08:00 |
|
USER-20220102CG\noblelift
|
a05fa03de5
|
更新信号同步线程
|
2024-05-13 14:37:43 +08:00 |
|
|
|
7de225053e
|
rev:设备驱动国际化以及设备监控国际化
|
2024-05-13 14:22:29 +08:00 |
|
|
|
756f7b47e0
|
fix: 日志bug修改
|
2024-05-13 13:42:53 +08:00 |
|
|
|
b51073e512
|
fix: 日志bug修改
|
2024-05-13 13:40:20 +08:00 |
|
|
|
be03e7a61e
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-05-13 13:25:57 +08:00 |
|
|
|
4414177cac
|
rev:返检、改切回传MES新增回传时间
|
2024-05-13 13:25:34 +08:00 |
|
|
|
7b771a0a9c
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-13 11:11:37 +08:00 |
|
|
|
3282f15af7
|
add: 输送机申请贴标demo
|
2024-05-13 11:10:46 +08:00 |
|
|
|
4e3dc384af
|
fix: 托盘类型不对，直接去扫码位托盘入库代码开发
|
2024-05-13 10:07:27 +08:00 |
|
zhouz
|
30ad6db6ac
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-13 09:35:08 +08:00 |
|
zhouz
|
6c4170cd59
|
rev;木箱入库修改
|
2024-05-13 09:35:01 +08:00 |
|
|
|
6831a82a5a
|
opt:空木箱入库增加层数
|
2024-05-12 16:43:16 +08:00 |
|
|
|
a6b9e54572
|
opt:空木箱入库增加层数
|
2024-05-12 15:26:32 +08:00 |
|
zhouz
|
a296a4845d
|
rev:空木箱入库修改
|
2024-05-12 15:12:49 +08:00 |
|
zhouz
|
095809680d
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-12 15:12:04 +08:00 |
|
zhouz
|
28059f4269
|
rev:空木箱入库修改
|
2024-05-12 15:12:00 +08:00 |
|
|
|
fde40a795a
|
fix: 任务暂停修复
|
2024-05-12 11:25:09 +08:00 |
|
|
|
3e0eb7fd54
|
fix: 申请成功后下发命令、堆垛机报警重试
|
2024-05-12 09:48:37 +08:00 |
|
|
|
2939259652
|
Merge remote-tracking branch 'origin/master'
|
2024-05-12 09:42:37 +08:00 |
|
|
|
7f1b8b8e29
|
fix: 申请成功后下发命令、堆垛机报警重试
|
2024-05-12 09:41:58 +08:00 |
|
|
|
9eea3bb5ea
|
opt:空木箱入库增加层数
|
2024-05-11 22:23:02 +08:00 |
|
|
|
4667761c9c
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
|
2024-05-11 22:12:54 +08:00 |
|
