|
|
557e8de75c
|
Merge remote-tracking branch 'origin/master'
|
2023-12-08 14:26:56 +08:00 |
|
|
|
3da0816d90
|
fix: 规约修改over
|
2023-12-08 14:26:29 +08:00 |
|
yanps
|
535f241642
|
fix: device_driver
|
2023-12-08 14:22:13 +08:00 |
|
yanps
|
322f8c5d4f
|
add: 定时删除设备报警记录中超十五天
|
2023-12-08 14:06:53 +08:00 |
|
|
|
e5588a2288
|
Merge remote-tracking branch 'origin/master'
|
2023-12-08 13:53:40 +08:00 |
|
|
|
db3cc16658
|
fix: 规约修改
|
2023-12-08 13:52:33 +08:00 |
|
yanps
|
e1bf2f026c
|
opt: 优化设备报警记录页面,并且实现国际化
|
2023-12-08 09:04:57 +08:00 |
|
|
|
936d17a437
|
fix: 注释修改2
|
2023-12-07 18:11:29 +08:00 |
|
|
|
346214e11e
|
fix: 注释修改
|
2023-12-07 17:50:07 +08:00 |
|
|
|
b74f79fd53
|
Merge remote-tracking branch 'origin/master'
|
2023-12-07 15:56:46 +08:00 |
|
|
|
63eb594141
|
fix: divece
|
2023-12-07 15:56:17 +08:00 |
|
yanps
|
fafbb6a842
|
fix: instruction
|
2023-12-07 15:53:47 +08:00 |
|
yanps
|
eeb1521e94
|
fix: utils
|
2023-12-07 15:36:05 +08:00 |
|
yanps
|
9c64d651f8
|
fix: udw
|
2023-12-07 15:14:56 +08:00 |
|
|
|
b76e6b2da0
|
add: 关联站点开发,代确认开发点
|
2023-12-07 15:13:14 +08:00 |
|
yanps
|
16b8bcd75d
|
fix: taskscreen
|
2023-12-07 15:06:05 +08:00 |
|
yanps
|
46bee96649
|
fix: task
|
2023-12-07 15:04:20 +08:00 |
|
yanps
|
a4c8c299d5
|
fix: storage_cell
|
2023-12-07 14:35:35 +08:00 |
|
yanps
|
212f4027da
|
fix: socket
|
2023-12-07 14:30:57 +08:00 |
|
|
|
5d53078397
|
add: 关联站点开发,代确认开发点
|
2023-12-07 14:29:12 +08:00 |
|
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 |
|
|
|
15ae1507d1
|
add: 开发
|
2023-12-06 15:55:56 +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 |
|
