yanps
|
69a7c4e256
|
fix: Route
|
2023-12-07 14:27:09 +08:00 |
|
yanps
|
64ae2fcf77
|
fix: produceshiftorderdetail
|
2023-12-07 13:57:24 +08:00 |
|
yanps
|
51068ad328
|
fix: produceshiftorder
|
2023-12-07 13:55:16 +08:00 |
|
yanps
|
5fe3cb7661
|
fix: plc
|
2023-12-07 13:44:51 +08:00 |
|
yanps
|
0e5e839396
|
fix: opc
|
2023-12-07 13:41:09 +08:00 |
|
yanps
|
c6699730f6
|
fix: monitor
|
2023-12-07 11:13:12 +08:00 |
|
yanps
|
f6a6957753
|
fix: materialbase
|
2023-12-07 11:11:15 +08:00 |
|
yanps
|
450d076728
|
fix: log
|
2023-12-07 11:06:12 +08:00 |
|
yanps
|
92548160ab
|
fix: labeling_template
|
2023-12-07 11:00:30 +08:00 |
|
yanps
|
92fdf0ccd6
|
fix: history
|
2023-12-07 10:54:24 +08:00 |
|
yanps
|
e2aca6f6f6
|
fix: enums
|
2023-12-07 10:46:35 +08:00 |
|
yanps
|
7162e90506
|
fix: AGV
|
2023-12-07 10:36:16 +08:00 |
|
yanps
|
155af6d590
|
fix: agv
|
2023-12-07 09:42:53 +08:00 |
|
|
|
69ae8f936b
|
Merge remote-tracking branch 'origin/master'
|
2023-12-06 18:36:17 +08:00 |
|
|
|
26e2863587
|
fix: Device
|
2023-12-06 18:36:03 +08:00 |
|
周俊杰
|
fe9bbce33c
|
fix:auto
|
2023-12-06 17:13:51 +08:00 |
|
|
|
4d339161b7
|
fix: CustomPolicy
|
2023-12-06 17:10:28 +08:00 |
|
|
|
d45e352ce2
|
Merge remote-tracking branch 'origin/master'
|
2023-12-06 16:25:17 +08:00 |
|
|
|
af130c327d
|
fix: Address
|
2023-12-06 16:25:02 +08:00 |
|
yanps
|
3a235b8f76
|
add: 历史模块添加设备报警记录
|
2023-12-06 16:12:36 +08:00 |
|
yanps
|
17d364714e
|
add: 历史模块添加设备报警记录
|
2023-12-06 16:08:37 +08:00 |
|
|
|
126490ffad
|
Merge remote-tracking branch 'origin/master'
|
2023-12-06 16:07:11 +08:00 |
|
|
|
1f680c1b0a
|
add: 常量池类
|
2023-12-06 16:06:57 +08:00 |
|
|
|
cdd6be9f89
|
rev：删除websock
|
2023-12-06 15:39:47 +08:00 |
|
|
|
849e0d1de8
|
rev：更新项目图标
|
2023-12-06 14:49:24 +08:00 |
|
|
|
3b2799d082
|
rev:界面优化
|
2023-12-06 11:23:04 +08:00 |
|
USER-20220102CG\noblelift
|
72c94c2d34
|
rev 冲突
|
2023-12-06 09:59:24 +08:00 |
|
USER-20220102CG\noblelift
|
655a5abb83
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_two
# Conflicts:
# acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/service/impl/TaskScreenServiceImpl.java
|
2023-12-06 09:58:33 +08:00 |
|
USER-20220102CG\noblelift
|
c2be716ca7
|
rev 更新目录结构
|
2023-12-06 09:56:09 +08:00 |
|
|
|
059a47f595
|
fix：界面优化，代码规约
|
2023-12-05 18:49:53 +08:00 |
|
USER-20220102CG\noblelift
|
57a0b71916
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_two
|
2023-12-05 18:06:09 +08:00 |
|
USER-20220102CG\noblelift
|
6abe6c2322
|
rev 修改枚举类与一期统一
|
2023-12-05 18:05:50 +08:00 |
|
yanps
|
9398535dcc
|
add: 历史记录模块添加导出功能
|
2023-12-05 18:01:27 +08:00 |
|
|
|
045a1f9066
|
Merge remote-tracking branch 'origin/master'
|
2023-12-05 17:45:41 +08:00 |
|
|
|
1156f212cf
|
fix: 双工位堆垛机修改
|
2023-12-05 17:45:26 +08:00 |
|
|
|
1dcff07d43
|
rev： 代码规范整理
|
2023-12-05 17:39:05 +08:00 |
|
|
|
b50fb70cd6
|
Merge branch 'lzhl_tow_acs_ls'
# Conflicts:
# acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/DoubleStationStackerDeviceDriver.java
# acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/double_station_stacker/ItemProtocol.java
|
2023-12-05 16:29:40 +08:00 |
|
|
|
66178ff39f
|
add: 双工位堆垛机
|
2023-12-05 16:18:43 +08:00 |
|
USER-20220102CG\noblelift
|
b0c1d7c221
|
rev 代码规范
|
2023-12-05 15:47:11 +08:00 |
|
USER-20220102CG\noblelift
|
a558838f14
|
ren 更新枚举类
|
2023-12-05 14:07:17 +08:00 |
|
|
|
46181368ef
|
rev：多余代码删除
|
2023-12-05 10:16:40 +08:00 |
|
|
|
3cc07c98bf
|
rev: 代码删除
|
2023-12-04 19:20:50 +08:00 |
|
|
|
e89e0e2be2
|
add:双工位堆垛机开发
|
2023-12-04 11:13:24 +08:00 |
|
|
|
564c78bc2b
|
'add:双工位堆垛机开发'
|
2023-12-04 10:55:51 +08:00 |
|
|
|
5f529cd1c7
|
add: 堆垛机开发
|
2023-12-01 15:46:28 +08:00 |
|
yanps
|
438e82d222
|
fix: 解决堆垛机出库,移库路由问题
|
2023-12-01 10:12:23 +08:00 |
|
yanps
|
368940fd24
|
add: 高级配置模块实现国际化
|
2023-11-30 16:24:55 +08:00 |
|
周俊杰
|
e3bbf6d18f
|
add 任务调度国际化
|
2023-11-30 15:07:13 +08:00 |
|
yanps
|
301033ef99
|
add: 日志管理模块实现国际化
|
2023-11-30 14:33:32 +08:00 |
|
|
|
e47f0853e2
|
add:堆垛机国际化
|
2023-11-30 14:08:17 +08:00 |
|
