yanps
|
47ac9d9ec9
|
Merge remote-tracking branch 'origin/master'
|
2023-11-15 14:13:36 +08:00 |
|
|
|
816d50d42d
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-11-15 13:45:20 +08:00 |
|
|
|
070adc96e2
|
rev:新增飞书接口
|
2023-11-15 13:45:12 +08:00 |
|
yanps
|
fe25998a24
|
opt: NDC双工位AGV优化
|
2023-11-13 19:57:46 +08:00 |
|
|
|
247457d4a3
|
opt:代码优化
|
2023-11-13 19:35:53 +08:00 |
|
|
|
c74ab66fdd
|
opt:内包间行架，输送线出口位驱动优化
|
2023-11-10 10:38:27 +08:00 |
|
yanps
|
7ec5df941c
|
opt: 纸管库,套管工位驱动优化
|
2023-11-09 14:06:57 +08:00 |
|
|
|
1181d4c192
|
opt:内包间行架和插拔轴机驱动代码优化
|
2023-11-09 13:21:01 +08:00 |
|
|
|
74e0977658
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-11-09 11:19:03 +08:00 |
|
|
|
5284aff25d
|
rev:数字孪生接口查询优化
|
2023-11-09 11:18:53 +08:00 |
|
|
|
f36891047d
|
rev 内包间行架
|
2023-11-09 10:02:16 +08:00 |
|
|
|
293906cdb5
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls
|
2023-11-09 09:58:00 +08:00 |
|
|
|
205798ad6e
|
fix
|
2023-11-09 09:56:53 +08:00 |
|
|
|
61ed74e4ae
|
rev：成品报废审核修改
|
2023-11-08 19:02:50 +08:00 |
|
yanps
|
46463e7b65
|
opt: 纸管库,套管工位驱动优化
|
2023-11-08 17:30:33 +08:00 |
|
|
|
7b142f95c4
|
add: 新增成品报废审核功能
|
2023-11-07 16:10:19 +08:00 |
|
|
|
78a4a4d6bd
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java
# acs/nladmin-system/src/main/java/org/nl/acs/task/service/dto/TaskDto.java
# acs/nladmin-ui/src/views/acs/device/config.vue
|
2023-11-07 13:39:36 +08:00 |
|
|
|
fa1a3a4e68
|
fix
|
2023-11-07 12:37:07 +08:00 |
|
yanps
|
d5c2a0bd3e
|
套管工位驱动
|
2023-11-07 11:07:49 +08:00 |
|
|
|
cf9213eab4
|
add:新增内包间行架驱动
|
2023-11-07 11:01:34 +08:00 |
|
yanps
|
4d53aaaf4e
|
纸管库和套管工位驱动
|
2023-11-07 10:57:10 +08:00 |
|
yanps
|
2e634be0ce
|
纸管库和套管工位驱动编写
|
2023-11-07 10:47:16 +08:00 |
|
USER-20220102CG\noblelift
|
82c46653e6
|
rev 新增任务字段
|
2023-11-03 14:32:40 +08:00 |
|
USER-20220102CG\noblelift
|
84d12e41dd
|
add 新增lms接口
|
2023-11-03 13:50:17 +08:00 |
|
USER-20220102CG\noblelift
|
772a6e8efa
|
add 新增纸管库驱动
|
2023-11-02 11:24:39 +08:00 |
|
USER-20220102CG\noblelift
|
b5cd16b295
|
rev 信号下发
|
2023-10-31 16:02:14 +08:00 |
|
|
|
d3063b472b
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-10-31 09:31:00 +08:00 |
|
|
|
aef28f43fe
|
dev:并发问题修改、数字孪生新增接口
|
2023-10-31 09:30:48 +08:00 |
|
|
|
737dbd336e
|
add:对烘箱对接位添加允许强制进入功能
|
2023-10-26 18:31:01 +08:00 |
|
USER-20220102CG\noblelift
|
75cea7fe40
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-10-26 17:17:35 +08:00 |
|
USER-20220102CG\noblelift
|
7740a8bbad
|
rev 行架任务校验
|
2023-10-26 17:17:13 +08:00 |
|
|
|
3e75d99207
|
rev：合并
|
2023-10-26 17:07:30 +08:00 |
|
|
|
f88200f2bd
|
Merge branch 'master_reform'
|
2023-10-26 17:06:08 +08:00 |
|
|
|
0c466793ba
|
rev: 限制木箱高度
|
2023-10-26 17:00:54 +08:00 |
|
|
|
384872d687
|
rev：立库改造、入库分配逻辑修改、移库逻辑修改
|
2023-10-25 08:58:23 +08:00 |
|
USER-20220102CG\noblelift
|
98c7717fcc
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-10-24 10:11:35 +08:00 |
|
USER-20220102CG\noblelift
|
c7fd9d892d
|
rev ndc链接
|
2023-10-24 10:10:57 +08:00 |
|
|
|
7caf22fff3
|
Merge branch 'package-dev'
|
2023-10-23 18:04:53 +08:00 |
|
|
|
c9f85aa08b
|
dev:报表优化、入库加并发锁
|
2023-10-23 17:50:13 +08:00 |
|
USER-20220102CG\noblelift
|
9224b0d07c
|
rev 修复任务指令内存问题
|
2023-10-19 11:28:09 +08:00 |
|
|
|
b8c9688018
|
dev:分支推送
|
2023-10-19 09:46:00 +08:00 |
|
|
|
4018922b9b
|
rev:测试
|
2023-10-19 09:28:32 +08:00 |
|
|
|
e650ea273a
|
rev:新增二期区域、查询优化
|
2023-10-18 14:32:29 +08:00 |
|
|
|
1d9f35dded
|
rev：是、出入库导出修改
|
2023-10-17 08:57:49 +08:00 |
|
|
|
f9c6c5e35e
|
rev：导出维护字段销售订单、行号
|
2023-10-16 17:35:12 +08:00 |
|
|
|
ee17bd9b32
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-10-16 17:29:43 +08:00 |
|
|
|
c9447c29a7
|
dev:修改明细查询BUG
|
2023-10-16 17:29:34 +08:00 |
|
|
|
98e39369f4
|
add：新增海亮二期仓库入库
|
2023-10-13 16:18:05 +08:00 |
|
|
|
f37290339c
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2023-10-13 16:14:44 +08:00 |
|
|
|
e1aa85bcb6
|
rev:报表优化
|
2023-10-13 16:14:36 +08:00 |
|
