|
|
e8bab5acef
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-07-03 13:15:11 +08:00 |
|
|
|
302d423d75
|
fix: return
|
2024-07-03 13:14:43 +08:00 |
|
|
|
13c454c758
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-07-03 13:09:51 +08:00 |
|
|
|
349d09d7c4
|
fix: 下发区域
|
2024-07-03 13:09:08 +08:00 |
|
|
|
acdca88bf5
|
Merge pull request 'b_lms_to_merge' (#6) from b_lms into master_merge
Reviewed-on: http://121.40.234.130:8899/root/lanzhouhailiang_one/pulls/6
|
2024-07-03 11:10:05 +08:00 |
|
|
|
465979349f
|
fix:装箱区增加日志记录
|
2024-07-03 11:05:26 +08:00 |
|
|
|
04d8f1e3d3
|
fix:装箱区增加日志记录
|
2024-07-03 10:14:26 +08:00 |
|
|
|
a70158b10d
|
fix:修复装箱区子卷状态为合格品
|
2024-07-03 09:45:17 +08:00 |
|
|
|
dc5e96e117
|
fix:修复装箱位子卷状态为合格品，临时插入子卷信息重复校验
|
2024-07-03 09:40:58 +08:00 |
|
|
|
2d53076a8f
|
add:增加不对接MES包装关系逻辑
|
2024-07-03 08:32:44 +08:00 |
|
|
|
0598067867
|
add:增加不对接MES包装关系逻辑
|
2024-07-03 08:24:18 +08:00 |
|
|
|
416bbc4085
|
add:增加不对接MES包装关系逻辑
|
2024-07-03 08:22:20 +08:00 |
|
zhouz
|
85c6e2cf49
|
Merge branch 'refs/heads/b_lms' into master_merge
|
2024-07-03 07:47:38 +08:00 |
|
zhouz
|
78703b146d
|
fix:暂时去除锂电不允许表处的逻辑
|
2024-07-03 07:47:12 +08:00 |
|
zhouz
|
3ea9af5e29
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-03 07:44:31 +08:00 |
|
|
|
c9834e21f4
|
add:增加不对接MES包装关系逻辑
|
2024-07-03 00:59:50 +08:00 |
|
|
|
e442dbac71
|
Merge pull request 'b_lms_to_merge' (#5) from b_lms into master_merge
Reviewed-on: http://121.40.234.130:8899/root/lanzhouhailiang_one/pulls/5
|
2024-07-03 00:49:15 +08:00 |
|
|
|
9838e9da98
|
add:增加不对接MES包装关系逻辑
|
2024-07-03 00:39:49 +08:00 |
|
|
|
d02dea3fcc
|
add:增加不对接MES包装关系逻辑
|
2024-07-02 23:57:50 +08:00 |
|
|
|
d4708ccc7a
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
# Conflicts:
# lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
|
2024-07-02 23:49:20 +08:00 |
|
|
|
ecd477768a
|
add:增加不对接MES包装关系逻辑
|
2024-07-02 23:47:05 +08:00 |
|
|
|
c1b47da9f0
|
add:增加不对接MES包装关系逻辑
|
2024-07-02 23:41:09 +08:00 |
|
zhouz
|
f846c48f32
|
fix:新增临时包装关系和空木箱入库逻辑优化
|
2024-07-02 23:37:41 +08:00 |
|
zhouz
|
2da22af59a
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-02 23:36:57 +08:00 |
|
|
|
5870a48fe4
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-07-02 22:45:29 +08:00 |
|
|
|
71f320e158
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-07-02 22:44:23 +08:00 |
|
|
|
74decb66f7
|
fix: pc可修改分切计划信息-前端
|
2024-07-02 22:44:13 +08:00 |
|
|
|
f606c6a16a
|
fix: pc可修改分切计划信息
|
2024-07-02 22:43:33 +08:00 |
|
|
|
2bf7146c87
|
rev:优化agv下发方法
|
2024-07-02 20:38:23 +08:00 |
|
|
|
4fb3552444
|
Merge remote-tracking branch 'origin/master'
|
2024-07-02 19:38:30 +08:00 |
|
|
|
72b6c48a55
|
fix: 行架action变成5修改，扫码位终点为货位修改
|
2024-07-02 19:38:09 +08:00 |
|
yanps
|
f9fc6e8a50
|
opt: 仙工驱动监控页面实现国际化,NDC反馈行架还原
|
2024-07-02 17:24:26 +08:00 |
|
|
|
c3a8cd70bd
|
add:增加子卷规格校验
|
2024-07-02 17:13:27 +08:00 |
|
|
|
3faf1b65c1
|
add:增加装箱区库存页面
|
2024-07-02 16:30:19 +08:00 |
|
zhouz
|
8add85dd71
|
Merge branch 'refs/heads/b_lms' into master_merge
|
2024-07-02 16:27:15 +08:00 |
|
zhouz
|
7824298f1a
|
fix:MES相关接口优化
|
2024-07-02 16:26:30 +08:00 |
|
|
|
6a2a26e3c4
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-07-02 15:48:09 +08:00 |
|
|
|
03a94a7179
|
fix: 呼叫气胀轴查询acs，气胀轴库没货则生成任务
|
2024-07-02 15:37:10 +08:00 |
|
|
|
2de875acd0
|
rev：增加捆扎相关校验
|
2024-07-02 14:03:20 +08:00 |
|
|
|
c8c1335329
|
Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms
|
2024-07-02 14:02:32 +08:00 |
|
|
|
90572dc622
|
rev：增加捆扎相关校验
|
2024-07-02 14:02:15 +08:00 |
|
|
|
f10d468c21
|
opt:优化子卷按子卷规格排序
|
2024-07-02 14:00:34 +08:00 |
|
|
|
2f6cbfd9c1
|
rev： 立库堆垛机相关任务下发时 给托盘号
|
2024-07-02 13:29:00 +08:00 |
|
|
|
5826a97da2
|
Merge remote-tracking branch 'origin/b_lms' into b_lms
|
2024-07-02 13:12:51 +08:00 |
|
|
|
1a72a6cb78
|
opt:优化一楼装箱区任务类相关校验
|
2024-07-02 13:12:34 +08:00 |
|
yanps
|
d795315fe1
|
opt: 仙工机器人信息设备监控显示优化
|
2024-07-02 11:21:13 +08:00 |
|
|
|
216cd5540f
|
rev:优化自动门写方法
|
2024-07-02 09:59:19 +08:00 |
|
|
|
818b88f70b
|
fix: 日志修改
|
2024-07-02 09:34:44 +08:00 |
|
|
|
a84a6544f9
|
fix: 手持菜单区分与清除暂存修改
|
2024-07-02 09:27:01 +08:00 |
|
|
|
1cf2e6305d
|
fix: 删除子卷包装关系，异常包裹
|
2024-07-01 22:00:58 +08:00 |
|
