HuangHuiKang
|
7acd167a8b
|
Merge branch 'main' into hhk
# Conflicts:
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/device/DeviceMapper.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java
|
1 month ago |
|
HuangHuiKang
|
e510a3b976
|
fix:修改数据采集Td数据库结构存储
|
1 month ago |
kkk-ops
|
e062c42740
|
组织-采集设备
|
1 month ago |
|
HuangHuiKang
|
ebb6014659
|
fix:修复实时数据点位类型展示问题
|
1 month ago |
|
kkk-ops
|
631211af89
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
# Conflicts:
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java
|
1 month ago |
|
kkk-ops
|
100331b455
|
commit
|
1 month ago |
86158
|
9c07497475
|
Merge branch 'plp'
|
1 month ago |
|
86158
|
a6c16a709e
|
fix：修复配方库编码重复问题
|
1 month ago |
|
HuangHuiKang
|
04ccfa06fe
|
fix:修改项目重启后继续订阅mqtt消息
|
1 month ago |
|
HuangHuiKang
|
1a33190acb
|
fix:修改配方库读取
|
1 month ago |
|
HuangHuiKang
|
b1a5f45b15
|
Merge branch 'hhk' into main
# Conflicts:
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DeviceRespVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/DeviceDO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java
|
1 month ago |
|
HuangHuiKang
|
572ff4c3dd
|
fix:修改读取数据方式opcuva为mqtt
|
1 month ago |
|
kkk-ops
|
3d4a8fb65c
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
1 month ago |
|
kkk-ops
|
03f839ed61
|
设备运行报表
|
1 month ago |
|
86158
|
ac9c0fdc7a
|
fix：质量管理-检验类型和检验任务编码重复问题
|
1 month ago |
|
86158
|
7f0031a589
|
fix：修改配方管理-配方配置的新增和编辑逻辑
|
1 month ago |
|
kkk-ops
|
fdba3ea563
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 months ago |
|
kkk-ops
|
8f08766aaa
|
merge
|
2 months ago |
|
HuangHuiKang
|
3105c47908
|
Merge branch 'hhk' into main
|
2 months ago |
|
HuangHuiKang
|
88934d7068
|
fix:修改配方库
|
2 months ago |
|
HuangHuiKang
|
fc4769a464
|
Merge branch 'hhk' into main
|
2 months ago |
|
HuangHuiKang
|
778fe392da
|
fix:修改配方库
|
2 months ago |
|
kkk-ops
|
afd95d255a
|
merge
|
2 months ago |
|
kkk-ops
|
fdc1e5e684
|
设备点位单位列表
|
2 months ago |
|
86158
|
1a9dadec7e
|
Merge branch 'plp'
# Conflicts:
# yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/criticalcomponent/CriticalComponentServiceImpl.java
|
2 months ago |
|
86158
|
1b9e55c492
|
feat：新增了采集设备模型-采集点、设备管理-设备关键件、备件管理-备件信息的数据导入功能
|
2 months ago |
|
HuangHuiKang
|
1e060796a0
|
fix:设备管理-任务管理-新增corn表达式不能小于一小时
|
2 months ago |
|
HuangHuiKang
|
23bb0016ba
|
fix:修改采集设备定时任务-添加连接中离线处理，添加运行状态默认为待机中
|
2 months ago |
|
HuangHuiKang
|
66bc902a07
|
fix:修改采集设备定时任务
|
2 months ago |
|
HuangHuiKang
|
baadf3c1fe
|
fix：优化修改告警页面分页
|
2 months ago |
|
HuangHuiKang
|
62eea2d16a
|
fix：优化历史数据分页
|
2 months ago |
|
86158
|
aa7c6da293
|
Merge branch 'refs/heads/plp'
# Conflicts:
# yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/mold/MoldServiceImpl.java
|
2 months ago |
|
86158
|
c7ef7a4e97
|
fix:修改模具和模具类型的编码为唯一
|
2 months ago |
|
HuangHuiKang
|
d2c45b0ff2
|
fix：修改模具下模问题
|
2 months ago |
|
kkk-ops
|
6464295857
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 months ago |
|
kkk-ops
|
f4819d840d
|
新增模具页面
|
2 months ago |
|
HuangHuiKang
|
1ad8100be1
|
fix：修改模具上模为多选，新增下模相关接口
|
2 months ago |
|
HuangHuiKang
|
628311098b
|
fix：设备管理模块-新增编码重复问题
|
2 months ago |
|
HuangHuiKang
|
50081338d9
|
fix：tdengine问题
|
2 months ago |
|
kkk-ops
|
6859b3d674
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 months ago |
|
kkk-ops
|
3196ab9fa8
|
项目类型 上下限
|
2 months ago |
|
HuangHuiKang
|
39e66f10a0
|
Merge branch 'hhk' into main
|
2 months ago |
|
HuangHuiKang
|
0745d219e5
|
fix：修复地址编码问题
|
2 months ago |
|
86158
|
e0f96747ca
|
Merge branch 'plp'
|
2 months ago |
|
86158
|
f93c81ed4f
|
feat:新增质检任务的取消功能，修改模具和设备的工单取消功能
|
2 months ago |
|
HuangHuiKang
|
2bd158614a
|
fix：修复bug，添加prod配置文件
|
2 months ago |
|
HuangHuiKang
|
8668c40dfc
|
Merge branch 'main' into hhk
|
2 months ago |
|
HuangHuiKang
|
5c84d87ee5
|
feat:新增大屏告警近七天，产线近七天接口。修改上传接口及文件限制大小。修复相关bug
|
2 months ago |
|
kkk-ops
|
aed851fbc5
|
清除import
|
2 months ago |
|
kkk-ops
|
307ba2b509
|
配方保存bug
|
2 months ago |