|
|
3967634972
|
fix: 过滤分切计划
|
2024-07-03 23:30:04 +08:00 |
|
|
|
63316e1f19
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-03 23:29:12 +08:00 |
|
|
|
7a6655360e
|
fix: 过滤分切计划
|
2024-07-03 23:28:49 +08:00 |
|
zhouz
|
4ab8648dd2
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-03 23:02:45 +08:00 |
|
zhouz
|
b6548b25aa
|
fix:分切计划上线临时修改方案
|
2024-07-03 23:02:24 +08:00 |
|
|
|
0583524aa7
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-07-03 19:25:01 +08:00 |
|
|
|
6c606c5f80
|
fix: 过滤空直分切计划
|
2024-07-03 19:24:13 +08:00 |
|
|
|
c77a5f03e5
|
fix:增加任务校验
|
2024-07-03 17:32:25 +08:00 |
|
yanps
|
053fac27f3
|
fix: agv系统显示修改
|
2024-07-03 17:11:02 +08:00 |
|
|
|
24678f2a47
|
合并
|
2024-07-03 16:46:44 +08:00 |
|
|
|
eaadc6b971
|
Merge commit '1f9ea990ecd9811e2002ef491e2fc57ae1848490' into master_merge
|
2024-07-03 16:45:36 +08:00 |
|
yanps
|
64dc664ad4
|
opt: 历史任务记录数据显示优化
|
2024-07-03 16:30:23 +08:00 |
|
|
|
fb8bda8086
|
fix: 过滤B6分切计划
|
2024-07-03 16:21:13 +08:00 |
|
|
|
9d8c85f192
|
opt：优化校验
|
2024-07-03 16:07:40 +08:00 |
|
|
|
49e07e2b20
|
fix: 修改区域选择
|
2024-07-03 16:07:38 +08:00 |
|
|
|
b856cb00a8
|
opt：优化校验
|
2024-07-03 16:07:05 +08:00 |
|
|
|
1f9ea990ec
|
rev：sap推送改切计划根据仓库生成多个单据
|
2024-07-03 16:01:24 +08:00 |
|
|
|
9b1280fa76
|
fix:去除校验
|
2024-07-03 15:38:27 +08:00 |
|
zhouz
|
14e00b4824
|
Merge remote-tracking branch 'origin/master_merge' into master_merge
|
2024-07-03 15:37:14 +08:00 |
|
zhouz
|
e8bccfced1
|
fix:发送数字孪生优化
|
2024-07-03 15:36:33 +08:00 |
|
|
|
b606e40f2c
|
fix: 修改区域选择
|
2024-07-03 14:28:47 +08:00 |
|
|
|
0ecbfb4678
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-07-03 13:26:32 +08:00 |
|
|
|
7a742a405d
|
fix: 访问气胀轴库是否有轴
|
2024-07-03 13:22:54 +08:00 |
|
|
|
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 |
|
