|
|
83d45da5c3
|
add：新增需求
|
2024-03-13 09:08:53 +08:00 |
|
|
|
036bc71e08
|
rev：向飞书推送图片：增加客户限制
|
2024-03-12 16:18:24 +08:00 |
|
|
|
57d571d5fa
|
rev：向飞书推送图片 加锁
|
2024-03-12 11:15:06 +08:00 |
|
|
|
e6241ada4d
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-03-12 09:24:42 +08:00 |
|
|
|
59b40b6174
|
dev:EXCEL定时器问题修改
|
2024-03-12 09:24:34 +08:00 |
|
yanps
|
f90070f8e5
|
fix: 修复入烘箱不创建第二条指令问题
|
2024-03-11 17:15:37 +08:00 |
|
|
|
efb5a18066
|
rev：向飞书推送图片，添加领导对应区域
|
2024-03-11 15:28:58 +08:00 |
|
|
|
f4e14eb6ba
|
rev:修复报错
|
2024-03-11 14:19:28 +08:00 |
|
|
|
e19fa045a3
|
rev:设备监控优化
|
2024-03-11 14:08:36 +08:00 |
|
|
|
4d18c231b9
|
fix: 行架对接位添加
|
2024-03-11 13:55:10 +08:00 |
|
|
|
c0b36da274
|
rev：区域人员
|
2024-03-11 09:53:07 +08:00 |
|
|
|
5a79e9eaaf
|
rev：向飞书推送图片 修改标题
|
2024-03-08 14:04:47 +08:00 |
|
|
|
f041a48558
|
rev：向飞书推送图片
|
2024-03-08 13:27:34 +08:00 |
|
yanps
|
19615e8ca7
|
opt: 路由同步，设备监控优化
|
2024-03-08 09:52:05 +08:00 |
|
|
|
0b7945a149
|
rev:新增请求接口，驱动代码优化
|
2024-03-07 18:12:53 +08:00 |
|
|
|
cc8b7597f8
|
rev：向飞书推送图片
|
2024-03-07 14:00:57 +08:00 |
|
|
|
d226688705
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-03-07 09:14:21 +08:00 |
|
|
|
1c795ec3fb
|
rev:飞书相关修改
|
2024-03-07 09:14:11 +08:00 |
|
|
|
f16b6a6795
|
fix:国际化导包报错
|
2024-03-06 13:19:19 +08:00 |
|
|
|
832366d6d6
|
测试
|
2024-03-06 09:59:53 +08:00 |
|
|
|
2cd9287fda
|
add： 向飞书推送图片
|
2024-03-05 18:43:21 +08:00 |
|
yanps
|
385fc2dac1
|
opt: 更改创建者显示，页面优化
|
2024-03-05 17:52:04 +08:00 |
|
|
|
edfb48330a
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-03-05 09:49:59 +08:00 |
|
|
|
fdb53b5d30
|
rev:内包间逻辑修改
|
2024-03-05 09:49:49 +08:00 |
|
|
|
05402cbdf1
|
Merge remote-tracking branch 'origin/master'
|
2024-03-04 16:23:45 +08:00 |
|
|
|
bf36bed276
|
fix :判断光电信号
|
2024-03-04 16:23:02 +08:00 |
|
|
|
1faf1dd652
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-03-01 16:50:44 +08:00 |
|
|
|
3da9bfe761
|
rev:定时导出EXCEL并上传到服务器
|
2024-03-01 14:11:34 +08:00 |
|
|
|
257864494e
|
Merge remote-tracking branch 'origin/master'
|
2024-03-01 14:06:40 +08:00 |
|
|
|
d4593bbf8f
|
fix :国际化修改
|
2024-03-01 14:05:31 +08:00 |
|
|
|
3af7a34c26
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-03-01 10:04:20 +08:00 |
|
|
|
fda88b222c
|
rev:新增表
|
2024-03-01 10:04:06 +08:00 |
|
|
|
36155bac2e
|
fix :国际化修改
|
2024-02-29 14:45:10 +08:00 |
|
|
|
881ade414e
|
Merge remote-tracking branch 'origin/master'
|
2024-02-29 13:14:05 +08:00 |
|
|
|
864990b446
|
fix :修改
|
2024-02-29 13:13:32 +08:00 |
|
|
|
f278b71ca0
|
rev:优化
|
2024-02-29 10:38:29 +08:00 |
|
|
|
1608d34733
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java
# acs2/nladmin-ui/src/views/system/monitor/device/index.vue
|
2024-02-29 10:37:12 +08:00 |
|
|
|
544e5dfaea
|
add：新增后端二楼驱动国际化
|
2024-02-29 10:30:48 +08:00 |
|
yanps
|
ae3b25f35a
|
opt: 异常日志，流量限制，创建任务优化
|
2024-02-28 16:35:50 +08:00 |
|
|
|
c010166c28
|
add :堆垛机异样处理
|
2024-02-28 16:14:34 +08:00 |
|
|
|
42e572a003
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
# acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
|
2024-02-26 16:33:08 +08:00 |
|
|
|
2f85b23948
|
fix :lms联调
|
2024-02-26 16:31:33 +08:00 |
|
yanps
|
7282a6ef66
|
opt: 设备优化
|
2024-02-23 16:37:01 +08:00 |
|
yanps
|
d4c89bc50f
|
opt: 三色灯回退,OPC连接优化
|
2024-02-23 15:38:33 +08:00 |
|
|
|
2498dea59f
|
rev:代码优化
|
2024-02-23 15:23:39 +08:00 |
|
|
|
20d2d77a21
|
Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
|
2024-02-22 19:05:06 +08:00 |
|
|
|
da3b9e6b78
|
rev:复烤回退
|
2024-02-22 19:04:47 +08:00 |
|
|
|
6c42abffde
|
Merge remote-tracking branch 'origin/master'
|
2024-02-22 17:59:25 +08:00 |
|
|
|
ff04f40bbc
|
fix :测试、对接点位
|
2024-02-22 17:55:13 +08:00 |
|
yanps
|
407c8b5152
|
opt: 设备监控
|
2024-02-21 09:56:25 +08:00 |
|
