|
|
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 |
|
yanps
|
df318c8e45
|
add: 添加行架-agv对接位取货完成反馈LMS
|
2024-06-27 18:47:46 +08:00 |
|
|
|
97a3bb970a
|
rev:优化分切行架任务排序
|
2024-06-27 18:34:06 +08:00 |
|
yanps
|
81201f1bf8
|
opt: 取消行架-agv对接位的取货放货完成校验
|
2024-06-27 17:15:14 +08:00 |
|
yanps
|
3d1bada4c9
|
add: 添加AGV进入离开烘箱区域反馈,下发管芯托盘信息
|
2024-06-27 17:01:01 +08:00 |
|
zhouz
|
2a370376be
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-06-27 17:00:21 +08:00 |
|
zhouz
|
430f4c795a
|
fix:WQL更新
|
2024-06-27 16:58:02 +08:00 |
|
|
|
e88415bada
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-06-27 16:00:57 +08:00 |
|
zhouz
|
cd7c68d61d
|
fix:代码合并
|
2024-06-27 15:56:08 +08:00 |
|
zhouz
|
cab08052ec
|
代码合并
|
2024-06-27 15:23:15 +08:00 |
|
|
|
1cbbe0a9fd
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-27 15:20:06 +08:00 |
|
|
|
c9c93cd2cc
|
fix: api错误
|
2024-06-27 15:19:36 +08:00 |
|
|
|
a714b8e2d6
|
fix:修复前端子卷号重复校验
|
2024-06-27 15:11:31 +08:00 |
|
|
|
39f10ae18f
|
rev：代码合并
|
2024-06-27 15:09:32 +08:00 |
|
|
|
07452b1630
|
Merge branch 'b_lms' into master_merge
|
2024-06-27 15:08:28 +08:00 |
|
|
|
cf0368756e
|
fix：二期出库打印无法打印发货单
|
2024-06-27 15:05:42 +08:00 |
|
|
|
2a92d9b11e
|
fix: 追加诺宝封口
|
2024-06-27 14:05:57 +08:00 |
|
zhouz
|
cba03a45ad
|
Merge branch 'refs/heads/b_lms' into master_merge
|
2024-06-27 11:04:21 +08:00 |
|
zhouz
|
590e7ec713
|
fix:websocket更新
|
2024-06-27 11:03:47 +08:00 |
|
|
|
250280db08
|
add: 添加二次分配顶点任务
|
2024-06-27 09:43:20 +08:00 |
|
|
|
759deb6f34
|
add: 添加二次分配顶点任务
|
2024-06-27 09:35:47 +08:00 |
|
|
|
5b1c96f39f
|
add: 添加二次分配顶点任务
|
2024-06-27 09:32:39 +08:00 |
|
zhouz
|
d1a269d284
|
fix:优化
|
2024-06-27 09:27:01 +08:00 |
|
|
|
2ae476a67a
|
Merge pull request 'b_lms_master_merge' (#3) from b_lms into master_merge
Reviewed-on: http://121.40.234.130:8899/root/lanzhouhailiang_one/pulls/3
|
2024-06-27 08:54:19 +08:00 |
|
|
|
18ea719b9f
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-27 08:49:12 +08:00 |
|
|
|
0fac3a2554
|
fix:修复前端子卷号重复校验
|
2024-06-27 08:48:41 +08:00 |
|
zhouz
|
6240eb9a72
|
代码合并
|
2024-06-26 23:09:09 +08:00 |
|
zhouz
|
32188cc4fe
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-06-26 21:49:24 +08:00 |
|
zhouz
|
2fad0075c6
|
fix:MES相关优化
|
2024-06-26 21:49:19 +08:00 |
|
|
|
35d18e93b0
|
remove: 去除备注
|
2024-06-26 17:46:19 +08:00 |
|
|
|
0473d9529e
|
rev：空木箱入库：优先将相同木箱规格的木箱放在同一深浅货位
|
2024-06-26 17:13:34 +08:00 |
|
|
|
ea8b70ec38
|
fix:修复前端子卷规格无法显示问题
|
2024-06-26 14:17:15 +08:00 |
|
|
|
4d729392c9
|
fix:修复前端子卷规格无法显示问题，装箱对接位子卷装箱数量问题
|
2024-06-26 12:46:51 +08:00 |
|
|
|
a0a7240975
|
fix: 堆垛机command顺序修改
|
2024-06-26 10:31:34 +08:00 |
|
|
|
bd153c9044
|
add:增加二次分配代码逻辑
|
2024-06-25 19:06:07 +08:00 |
|
