|
|
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 |
|
|
|
b035da2cca
|
fix:修复设备监控页面报错问题
|
2024-06-14 09:37:38 +08:00 |
|
zhouz
|
4c2f358adb
|
Merge branch 'refs/heads/b_lms' into master_merge
|
2024-06-14 09:10:34 +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 |
|
zhouz
|
ecb78f88be
|
Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge
|
2024-06-14 09:07:38 +08:00 |
|
zhouz
|
c40db4deb1
|
fix:内包间代码优化
|
2024-06-14 09:07:00 +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 |
|
wangsong
|
62bf1f9ef4
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-06-13 14:29:40 +08:00 |
|
wangsong
|
5f6e0f61b5
|
add
|
2024-06-13 14:29:00 +08:00 |
|
|
|
f299f1c7d5
|
opt:优化现场联调产生的问题
|
2024-06-13 13:29:49 +08:00 |
|
|
|
7742b23a55
|
Merge pull request 'b_lms' (#2) from b_lms into master_merge
Reviewed-on: http://121.40.234.130:8899/root/lanzhouhailiang_one/pulls/2
|
2024-06-12 18:57:32 +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
|
cb4117cf73
|
Merge branch 'refs/heads/b_lms' into master_merge
|
2024-06-12 13:38:18 +08:00 |
|
zhouz
|
6c5bc123c9
|
fix:反馈ACS管芯库存
|
2024-06-12 11:32:20 +08:00 |
|
zhouz
|
ad2879667b
|
fix:反馈ACS管芯库存
|
2024-06-12 11:24:57 +08:00 |
|
|
|
c2384e73a4
|
feat: 手持穿拔轴初始化
|
2024-06-12 10:13:52 +08:00 |
|
|
|
0a98b9ac44
|
fix: 监控大屏报错调试
|
2024-06-12 09:25:20 +08:00 |
|
|
|
6781a60a3f
|
fix: 一楼联调
|
2024-06-11 14:59:32 +08:00 |
|
|
|
46c641b96b
|
fix: 任务不显示完整气胀轴编码
|
2024-06-11 14:48:31 +08:00 |
|
zhouz
|
e9f0a3fcad
|
fix:内包间代码逻辑优化
|
2024-06-11 10:08:32 +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 |
|
|
|
c2a186d387
|
Merge remote-tracking branch 'origin/master' into master_merge
|
2024-06-11 09:43:31 +08:00 |
|
|
|
84af84b50c
|
Merge remote-tracking branch 'origin/b_lms' into master_merge
|
2024-06-11 09:41:15 +08:00 |
|
|
|
9c84311c22
|
fix: 忘记把变量写进去了
|
2024-06-11 09:29:59 +08:00 |
|
|
|
14017d88af
|
fix: 气胀轴编码：生产区域+机台编号+分切组+日期+ -轴上下
|
2024-06-11 09:28:30 +08:00 |
|
|
|
753a4df8df
|
fix: 前端大屏显示
|
2024-06-09 10:42:08 +08:00 |
|
|
|
97af976806
|
add:新增分切行架异常任务下发
|
2024-06-07 18:11:58 +08:00 |
|
|
|
e858f57e76
|
fix: 无法登录，去除域名配置
|
2024-06-07 17:22:34 +08:00 |
|
|
|
dc6904fabd
|
rev：前端修改
|
2024-06-07 17:08:40 +08:00 |
|
zhangzq
|
8e19f7c588
|
merge:配置文件
|
2024-06-07 17:03:29 +08:00 |
|
zhangzq
|
91e0ce0752
|
merge:冲突处理
|
2024-06-07 16:59:20 +08:00 |
|
zhangzq
|
c33ffe440b
|
Merge branch 'master' into b_lms2
|
2024-06-07 16:21:32 +08:00 |
|
zhouz
|
bc4fd0c139
|
fix:备货区组盘
|
2024-06-07 14:56:05 +08:00 |
|
zhouz
|
cca9e80cda
|
fix:纸管库存扣减
|
2024-06-07 09:23:29 +08:00 |
|
yanps
|
bfd22526bf
|
add: 添加管芯抓取反馈
|
2024-06-06 16:41:33 +08:00 |
|
|
|
0fbc830b00
|
rev：字段修改
|
2024-06-06 15:54:46 +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 |
|
|
|
9aba17fd13
|
rev：成品报废审核增加接口报错信息
|
2024-06-06 09:35:53 +08:00 |
|
yanps
|
6f1d80737e
|
opt: 废箔称重,agv取废箔联调优化
|
2024-06-05 17:43:07 +08:00 |
|
|
|
94f17e8464
|
rev：报废回传修改
|
2024-06-05 15:24:15 +08:00 |
|
|
|
3fa97cac25
|
fix: ACS请求扣除纸管数量
|
2024-06-04 17:04:04 +08:00 |
|
