|
|
8c8c08b8f3
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-06-30 10:43:33 +08:00 |
|
|
|
23bfb3ce1c
|
fix:修复修改密码报错问题
|
2024-06-30 09:52:27 +08:00 |
|
|
|
170f925202
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-30 09:49:43 +08:00 |
|
|
|
274fd9f624
|
feat: 套轴异常处理情况v1
|
2024-06-30 09:49:31 +08:00 |
|
|
|
0750e6c16f
|
fix: bug修复
|
2024-06-30 09:31:54 +08:00 |
|
zhouz
|
c0ba71e24b
|
Merge branch 'refs/heads/b_lms' into master_merge
|
2024-06-29 21:53:14 +08:00 |
|
zhouz
|
79d0e10a43
|
fix:WQL文件修改
|
2024-06-29 21:52:46 +08:00 |
|
zhouz
|
371cc4abee
|
Merge branch 'refs/heads/b_lms' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls
|
2024-06-29 19:10:34 +08:00 |
|
zhouz
|
236ef6bedb
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-29 19:09:52 +08:00 |
|
zhouz
|
3ca403632d
|
fix:WQL合并
|
2024-06-29 19:09:29 +08:00 |
|
|
|
964ce2a306
|
fix: 备货纸管扣除
|
2024-06-29 18:12:21 +08:00 |
|
zhouz
|
9e32eca116
|
fix:WQL修改
|
2024-06-29 17:55:59 +08:00 |
|
|
|
3886dce826
|
fix: 纸管信息
|
2024-06-29 17:34:46 +08:00 |
|
zhouz
|
2e69177359
|
Merge branch 'refs/heads/b_lms' into master_merge
|
2024-06-29 16:50:20 +08:00 |
|
|
|
0fd7a3cf64
|
add:增加二次分配请求频繁处理
|
2024-06-29 16:45:31 +08:00 |
|
|
|
43d7236761
|
fix: 二次分配任务指令前端添加字段
|
2024-06-29 16:41:54 +08:00 |
|
zhouz
|
23c7d3ab4a
|
fix:WQL优化
|
2024-06-29 16:40:24 +08:00 |
|
zhouz
|
f8d9ad12e4
|
fix:MES变更库区
|
2024-06-29 16:37:34 +08:00 |
|
|
|
c79bd1a186
|
add:增加二次分配请求频繁处理
|
2024-06-29 15:49:55 +08:00 |
|
|
|
022eff8245
|
Merge remote-tracking branch 'origin/master'
|
2024-06-29 15:11:05 +08:00 |
|
|
|
47613fdbbc
|
fix: 仙宫日志添加
|
2024-06-29 15:10:35 +08:00 |
|
|
|
d851b6c6ba
|
fix: 备货区任务修改
|
2024-06-29 14:10:32 +08:00 |
|
zhouz
|
898b1ab452
|
fix:下发电气信号添加区域
|
2024-06-29 13:59:56 +08:00 |
|
zhouz
|
a96df9b8a6
|
fix:套管优化
|
2024-06-29 13:19:49 +08:00 |
|
zhouz
|
ad068ed538
|
Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge
|
2024-06-29 10:48:28 +08:00 |
|
zhouz
|
946857d454
|
fix:问题优化
|
2024-06-29 10:48:17 +08:00 |
|
|
|
1a86159e34
|
add:增加自动执行等待的桁架任务
|
2024-06-29 09:21:25 +08:00 |
|
|
|
830a523d56
|
rev：木箱类型
|
2024-06-28 16:31:32 +08:00 |
|
yanps
|
a627c9c74c
|
opt: 优化
|
2024-06-28 16:06:14 +08:00 |
|
yanps
|
ed59096b16
|
opt: 添加普通站点取货完成反馈
|
2024-06-28 16:04:18 +08:00 |
|
|
|
956e6c99df
|
add：木箱类型
|
2024-06-28 15:13:10 +08:00 |
|
|
|
66212b6ed4
|
fix: 手持下拉框
|
2024-06-28 14:59:21 +08:00 |
|
|
|
e17eed36ca
|
fix: 手持点位下拉框过滤
|
2024-06-28 14:49:30 +08:00 |
|
|
|
a7bd40dcbd
|
fix: 备货区反馈acs纸管信息改为string
|
2024-06-28 14:44:17 +08:00 |
|
|
|
b9cf783ccd
|
fix: 97信号校验
|
2024-06-28 13:58:52 +08:00 |
|
yanps
|
5b96e256ad
|
Merge branch 'master' of 121.40.234.130:root/lanzhouhailiang_one
|
2024-06-28 11:29:04 +08:00 |
|
yanps
|
6955df3274
|
opt: 取货完成反馈日志优化
|
2024-06-28 11:28:54 +08:00 |
|
yanps
|
9d8e61c259
|
add:添加行架-agv对接位取货完成反馈
|
2024-06-28 11:27:19 +08:00 |
|
|
|
f614e469cb
|
fix: 日志更新
|
2024-06-28 10:37:15 +08:00 |
|
|
|
142fc1dfea
|
rev: 二期出库报错修改
|
2024-06-28 10:31:23 +08:00 |
|
|
|
c053f7a2dd
|
fix：二期出库完成报错bug修复
|
2024-06-28 10:13:23 +08:00 |
|
|
|
217e8d86d2
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
|
2024-06-28 09:19:18 +08:00 |
|
|
|
aa53ece8ab
|
rev:优化日志检索页面
|
2024-06-28 09:08:04 +08:00 |
|
|
|
b0d72c6db7
|
fix: 1、分切下料缓存
2、内包间新增97信号直接套轴完成
3、手持分切暂存送料到内包间
4、手持清理分切暂存数据
|
2024-06-28 09:06:08 +08:00 |
|
|
|
2874439aa1
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-28 01:30:16 +08:00 |
|
|
|
a9ef3d8f69
|
fix:增加二次分配任务重复校验
|
2024-06-28 01:30:03 +08:00 |
|
USER-20220102CG\noblelift
|
2134dcfd33
|
rev 对接工位信号写入
|
2024-06-27 20:35:45 +08:00 |
|
|
|
ce1d9377d5
|
opt
|
2024-06-27 18:50:58 +08:00 |
|
|
|
d5fc48cc85
|
Merge remote-tracking branch 'origin/master'
|
2024-06-27 18:49:04 +08:00 |
|
|
|
8762465bba
|
rev:优化异常分切行架任务排序
|
2024-06-27 18:48:41 +08:00 |
|
