|
|
cf95dc505c
|
fix:发货出库木箱号解析错误导致查不到子卷问题；
|
2024-06-18 15:33:14 +08:00 |
|
|
|
15a46f0c62
|
opt:6.18 线上部署测试环境
|
2024-06-18 12:48:01 +08:00 |
|
zhouz
|
e8dec156d5
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-18 10:04:19 +08:00 |
|
zhouz
|
212b14008f
|
fix:BUG修改
|
2024-06-18 10:04:10 +08:00 |
|
|
|
fd7f0e488b
|
opt:6.15上线装箱区代码修改
|
2024-06-17 21:26:41 +08:00 |
|
|
|
019022a5a8
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-17 13:12:36 +08:00 |
|
|
|
d3f33a12d1
|
opt:6.15上线装箱区代码修改
|
2024-06-17 13:12:24 +08:00 |
|
zhouz
|
8d1b82e3f9
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-06-17 11:04:35 +08:00 |
|
zhouz
|
12bded91fb
|
fix:立库代码更新
|
2024-06-17 11:04:31 +08:00 |
|
|
|
12e72ae6fd
|
opt:6.15上线装箱区代码修改
|
2024-06-17 11:01:36 +08:00 |
|
|
|
78fb4e7a5f
|
opt:6.15上线装箱区代码修改
|
2024-06-15 14:18:28 +08:00 |
|
|
|
f4db63c3fe
|
fix: 无法登录
|
2024-06-14 21:29:10 +08:00 |
|
|
|
a0b09b8361
|
feat: getCanMovePointOne 新增校验可用点位
|
2024-06-14 17:10:17 +08:00 |
|
|
|
4a1269fe45
|
fix: 查找剩余同组分切计划BUG
|
2024-06-14 16:29:05 +08:00 |
|
|
|
aed5b198ba
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-14 14:58:23 +08:00 |
|
|
|
248746de38
|
opt:6.15上线装箱区代码修改
|
2024-06-14 14:58:06 +08:00 |
|
|
|
a66c01549a
|
rev：代码合并
|
2024-06-14 14:14:35 +08:00 |
|
|
|
d5ea6fad1d
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-06-14 14:13:58 +08:00 |
|
|
|
f4c93965b9
|
rev：出库任务拆分
|
2024-06-14 14:13:50 +08:00 |
|
zhouz
|
14bba1617f
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-06-14 09:09:54 +08:00 |
|
zhouz
|
12a59a083c
|
fix:内包间代码优化
|
2024-06-14 09:09:23 +08:00 |
|
|
|
d5513d1075
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-13 23:21:31 +08:00 |
|
|
|
3d8a4a0cae
|
opt:优化待检区到装箱区agv搬运任务
|
2024-06-13 23:21:09 +08:00 |
|
|
|
81d06decbb
|
fix: 查找相同组气胀轴BUG
|
2024-06-13 18:19:10 +08:00 |
|
|
|
5ed5153bb4
|
opt:优化现场联调产生的一些问题
|
2024-06-12 18:49:27 +08:00 |
|
|
|
1aa9a90372
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-06-12 17:02:44 +08:00 |
|
|
|
a7f84ba0e2
|
fix: 呼叫套轴校验是否可成组合的分切计划，继续套轴
|
2024-06-12 17:01:45 +08:00 |
|
zhouz
|
6c5bc123c9
|
fix:反馈ACS管芯库存
|
2024-06-12 11:32:20 +08:00 |
|
|
|
c2384e73a4
|
feat: 手持穿拔轴初始化
|
2024-06-12 10:13:52 +08:00 |
|
|
|
46c641b96b
|
fix: 任务不显示完整气胀轴编码
|
2024-06-11 14:48:31 +08:00 |
|
zhouz
|
506dcbe372
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-06-11 09:53:29 +08:00 |
|
zhouz
|
774fb2baa2
|
fix:内包间代码逻辑优化
|
2024-06-11 09:53:22 +08:00 |
|
|
|
9c84311c22
|
fix: 忘记把变量写进去了
|
2024-06-11 09:29:59 +08:00 |
|
|
|
14017d88af
|
fix: 气胀轴编码：生产区域+机台编号+分切组+日期+ -轴上下
|
2024-06-11 09:28:30 +08:00 |
|
zhouz
|
bc4fd0c139
|
fix:备货区组盘
|
2024-06-07 14:56:05 +08:00 |
|
zhouz
|
cca9e80cda
|
fix:纸管库存扣减
|
2024-06-07 09:23:29 +08:00 |
|
zhouz
|
9cb97a4b59
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
# lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
|
2024-06-06 13:52:39 +08:00 |
|
zhouz
|
19a65d3dd7
|
fix:废箔AGV任务
|
2024-06-06 13:31:20 +08:00 |
|
|
|
3fa97cac25
|
fix: ACS请求扣除纸管数量
|
2024-06-04 17:04:04 +08:00 |
|
|
|
935fdcaf8f
|
fix: 判断纸管、呼叫AGV更换托盘
|
2024-06-04 15:02:51 +08:00 |
|
zhouz
|
f84e0fb42e
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-06-04 10:37:40 +08:00 |
|
zhouz
|
ce3324a8af
|
fix;表处代码修改
|
2024-06-04 10:37:35 +08:00 |
|
|
|
e51fd6577a
|
fix: 纸管重量保存失败
|
2024-06-03 15:59:24 +08:00 |
|
|
|
1395078a48
|
fix: 分切下料-下单上单更新库存失败
|
2024-05-31 16:34:33 +08:00 |
|
zhouz
|
cf451f52c9
|
fix:分切行架任务点位修正
|
2024-05-31 16:14:27 +08:00 |
|
|
|
588cbc7767
|
fix: 分切
|
2024-05-31 15:14:21 +08:00 |
|
zhouz
|
d2140c8469
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-05-31 10:16:50 +08:00 |
|
zhouz
|
72863a797b
|
fix:桁架下卷
|
2024-05-31 10:16:43 +08:00 |
|
|
|
179b3eac45
|
fix: 字段
|
2024-05-31 10:14:11 +08:00 |
|
|
|
ac608ed2ca
|
rev：出库口自动分配
|
2024-05-31 09:00:14 +08:00 |
|
