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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
06214fa21c
|
fix: 异步更新、入库测试
|
2024-06-04 16:49:36 +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 |
|
|
|
c6992eb8dc
|
Merge remote-tracking branch 'origin/master'
|
2024-06-03 18:35:47 +08:00 |
|
|
|
32f2a07c91
|
fix: 出库大批量测试、入库测试
|
2024-06-03 18:35:07 +08:00 |
|
|
|
e51fd6577a
|
fix: 纸管重量保存失败
|
2024-06-03 15:59:24 +08:00 |
|
yanps
|
8a517cee3d
|
opt: 分切上料联调优化
|
2024-06-02 17:50:18 +08:00 |
|
yanps
|
efd08c55fa
|
opt: 联调优化
|
2024-06-01 17:15:31 +08:00 |
|
|
|
12b38767a5
|
fix: 联调修改
|
2024-06-01 16:41:39 +08:00 |
|
|
|
4b54fdcbd2
|
Merge remote-tracking branch 'origin/master'
|
2024-05-31 17:18:52 +08:00 |
|
|
|
7bc761a53b
|
fix: 联调
|
2024-05-31 17:17:48 +08:00 |
|
yanps
|
5c1aadb43c
|
opt: agv偏移实现两个点位调整,设备信号优化
|
2024-05-31 16:58:01 +08:00 |
|
|
|
1395078a48
|
fix: 分切下料-下单上单更新库存失败
|
2024-05-31 16:34:33 +08:00 |
|
zhouz
|
cf451f52c9
|
fix:分切行架任务点位修正
|
2024-05-31 16:14:27 +08:00 |
|
