Commit Graph

348 Commits

Author SHA1 Message Date
yanps
0a6ccbf76b fix: 指令未满足条件,变成执行中 2023-12-20 10:58:01 +08:00
6560d294f8 fix:tosize添加 2023-12-19 09:39:07 +08:00
0b764880ad Merge remote-tracking branch 'origin/master' 2023-12-19 09:29:19 +08:00
7085c09289 fix:调试修改 2023-12-19 09:28:54 +08:00
yanps
f35bb8e115 fix: 创建任务模板修改 2023-12-17 11:45:52 +08:00
USER-20220102CG\noblelift
f04013cf3d rev 更新 2023-12-17 11:37:40 +08:00
yanps
24286d5e57 fix: 修改paper_array的转换异常 2023-12-17 11:03:01 +08:00
be12fd8773 fix:写入修改 2023-12-17 10:53:49 +08:00
USER-20220102CG\noblelift
8b63fa3ae0 rev 修改bug 2023-12-16 10:19:18 +08:00
USER-20220102CG\noblelift
7a43f4679d rev 删除多余日志 2023-12-14 17:45:30 +08:00
yanps
870eddad41 fix: 纸管库出货数量数据格式修改 2023-12-14 15:52:46 +08:00
yanps
4338fe8955 opt: 优化设备监控中的纸管库 2023-12-14 13:50:12 +08:00
yanps
d14c0dfa9b opt: 优化创建任务的参数和页面 2023-12-13 18:01:07 +08:00
yanps
d3dbb4191f add: 添加创建任务的字段 2023-12-13 15:55:28 +08:00
USER-20220102CG\noblelift
b517f41682 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-12-13 15:49:47 +08:00
USER-20220102CG\noblelift
e0808d770c rev 更新套管工位 2023-12-13 15:48:41 +08:00
b98beff8ce rev 优化 2023-12-13 14:59:06 +08:00
yanps
d7c8665c54 opt: 套管工位实现套管完成业务 2023-12-13 10:53:17 +08:00
yanps
a2051a8e2a opt: 内包间驱动优化 2023-12-13 09:59:13 +08:00
yanps
d31bdc14ce opt: 优化 2023-12-13 09:58:18 +08:00
b5b00f0669 rev:更新代码 2023-12-13 09:48:19 +08:00
dacad71eac rev:更新驱动点位地址 2023-12-13 09:45:43 +08:00
19ed527a0a fix 2023-12-12 16:57:59 +08:00
7b27f86111 Merge remote-tracking branch 'origin/master' 2023-12-12 16:56:15 +08:00
6572957a09 fix:驱动代码修改 2023-12-12 16:54:49 +08:00
USER-20220102CG\noblelift
5ca08b760e rev 优化 2023-12-12 16:31:03 +08:00
188e46b0fb add:新增rgv驱动 2023-12-11 16:12:11 +08:00
ea75b54f38 报错时data注释 2023-11-16 10:19:19 +08:00
yanps
f826b0ba77 opt: NDC双工位AGV优化 2023-11-15 14:13:59 +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
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
yanps
46463e7b65 opt: 纸管库,套管工位驱动优化 2023-11-08 17:30:33 +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
737dbd336e add:对烘箱对接位添加允许强制进入功能 2023-10-26 18:31:01 +08:00
USER-20220102CG\noblelift
7740a8bbad rev 行架任务校验 2023-10-26 17:17:13 +08:00