HuangHuiKang
|
d0569d9d0a
|
fix:1、修改能耗管理-能耗报表，读取数据逻辑 2、修改总览大屏-能耗周趋势接口 3、修改产线大屏-能耗监测接口
|
3 months ago |
86158
|
3a65a27e17
|
fix:修改大屏设备点位数据接口
|
3 months ago |
kkk-ops
|
e062c42740
|
组织-采集设备
|
3 months 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
|
3 months ago |
|
kkk-ops
|
100331b455
|
commit
|
3 months 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
|
3 months ago |
|
HuangHuiKang
|
572ff4c3dd
|
fix:修改读取数据方式opcuva为mqtt
|
3 months ago |
|
kkk-ops
|
3d4a8fb65c
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
3 months ago |
|
kkk-ops
|
03f839ed61
|
设备运行报表
|
3 months ago |
|
86158
|
ac9c0fdc7a
|
fix：质量管理-检验类型和检验任务编码重复问题
|
3 months ago |
|
HuangHuiKang
|
fc4769a464
|
Merge branch 'hhk' into main
|
3 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
|
3 months ago |
|
86158
|
1b9e55c492
|
feat：新增了采集设备模型-采集点、设备管理-设备关键件、备件管理-备件信息的数据导入功能
|
3 months ago |
|
HuangHuiKang
|
1e060796a0
|
fix:设备管理-任务管理-新增corn表达式不能小于一小时
|
3 months ago |
|
HuangHuiKang
|
d2c45b0ff2
|
fix：修改模具下模问题
|
3 months ago |
|
kkk-ops
|
6464295857
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
3 months ago |
|
kkk-ops
|
f4819d840d
|
新增模具页面
|
3 months ago |
|
HuangHuiKang
|
1ad8100be1
|
fix：修改模具上模为多选，新增下模相关接口
|
3 months ago |
|
HuangHuiKang
|
628311098b
|
fix：设备管理模块-新增编码重复问题
|
3 months ago |
|
kkk-ops
|
6859b3d674
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
3 months ago |
|
kkk-ops
|
3196ab9fa8
|
项目类型 上下限
|
3 months ago |
|
86158
|
e0f96747ca
|
Merge branch 'plp'
|
3 months ago |
|
86158
|
f93c81ed4f
|
feat:新增质检任务的取消功能，修改模具和设备的工单取消功能
|
3 months ago |
|
HuangHuiKang
|
2bd158614a
|
fix：修复bug，添加prod配置文件
|
3 months ago |
|
kkk-ops
|
aed851fbc5
|
清除import
|
3 months ago |
|
kkk-ops
|
307ba2b509
|
配方保存bug
|
3 months ago |
|
HuangHuiKang
|
5d92f3cf9d
|
Merge branch 'main' into hhk
|
3 months ago |
|
HuangHuiKang
|
9fa8da65f5
|
feat:新增大屏告警近七天，产线近七天接口。修改上传接口及文件限制大小。修复相关bug
|
3 months ago |
|
86158
|
5e57a231c5
|
feat:完成大屏设备点位数据接口
|
3 months ago |
|
kkk-ops
|
43c6726455
|
产线关联设备台账 台账关联采集设备
|
3 months ago |
|
HuangHuiKang
|
23e608df6e
|
Merge branch 'hhk' into main
|
3 months ago |
|
HuangHuiKang
|
2984fef8f2
|
fix:修复bug
|
3 months ago |
|
HuangHuiKang
|
5e2676998d
|
Merge branch 'hhk' into main
|
3 months ago |
|
HuangHuiKang
|
a8ca54bb1f
|
feat:完成大屏产能统计接口、产能近七天趋势图接口、能耗周趋势接口
|
3 months ago |
|
HuangHuiKang
|
d409357991
|
Merge branch 'hhk' into main
|
3 months ago |
|
HuangHuiKang
|
20d35645a3
|
feat:完成告警页面、大屏能耗检测统计
|
3 months ago |
|
86158
|
8aacbdaa6c
|
fix:模具工单bug
|
3 months ago |
|
kkk-ops
|
2f0d11ac29
|
merge
|
3 months ago |
|
86158
|
5bea1b3a23
|
fix:模具bug
|
3 months ago |
|
kkk-ops
|
3cf649ca92
|
综合大屏
|
3 months ago |
|
86158
|
aa7a53b2c5
|
Merge branch 'plp'
# Conflicts:
# yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/deviceledger/DeviceLedgerDO.java
# yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java
# yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairService.java
# yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldrepair/MoldRepairServiceImpl.java
# yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementService.java
# yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/moldticketmanagement/MoldTicketManagementServiceImpl.java
|
3 months ago |
|
86158
|
1fa7c0ac2a
|
Merge remote-tracking branch 'origin/main'
|
3 months ago |
|
HuangHuiKang
|
121c447608
|
feat:完成大屏各任务统计、各任务列表接口。
|
3 months ago |
|
86158
|
8371002507
|
fix:迁移部分模具功能到common模块
|
3 months ago |
|
HuangHuiKang
|
d8c5f86c59
|
fix:优化能耗管理-能源报表接口
|
3 months ago |
|
kkk-ops
|
5a27d83074
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
3 months ago |
|
kkk-ops
|
9c311b9115
|
首页
|
3 months ago |
|
HuangHuiKang
|
ea371faf56
|
fix:修改导出接口
|
3 months ago |
|
86158
|
3104a4fc07
|
Merge branch 'plp'
|
3 months ago |
|
86158
|
0d23cf3c3c
|
fix:修改表格导出
|
3 months ago |
|
kkk-ops
|
86190340ee
|
bug
|
4 months ago |
|
kkk-ops
|
4248828933
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
4 months ago |
|
kkk-ops
|
43fb1c2242
|
首页
|
4 months ago |
|
86158
|
e425c12f8b
|
feat:新增可视化大屏
|
4 months ago |
|
HuangHuiKang
|
a61a35cc7d
|
Merge branch 'hhk' into main
|
4 months ago |
|
HuangHuiKang
|
876dcdd7ca
|
feat:完成定时任务对每个点位的规则判断存入数据库
|
4 months ago |
|
86158
|
a112373b17
|
fix:修改了模具详情的点检保养维修履历界面
|
4 months ago |
|
HuangHuiKang
|
108c207b3d
|
Merge branch 'hhk' into main
|
4 months ago |
|
HuangHuiKang
|
95dff0da41
|
feat:完成点位规则接口
|
4 months ago |
|
86158
|
897e7dffd4
|
fix:修改了一些质量管理的显示问题
|
4 months ago |
|
HuangHuiKang
|
ca5466e499
|
Merge branch 'hhk' into main
|
4 months ago |
|
HuangHuiKang
|
ead838a214
|
fix:修改设备详情负责人显示问题
|
4 months ago |
|
86158
|
46453c9664
|
Merge branch 'plp'
|
4 months ago |
|
86158
|
6c89510fd1
|
完成了质量管理-检验任务
|
4 months ago |
|
HuangHuiKang
|
69a404b872
|
Merge branch 'hhk' into main
|
4 months ago |
|
HuangHuiKang
|
0f4126a59c
|
feat:完成 1、点检列表、导出。2、保养列表、导出。3、维修列表、导出。4、关键件导出 5、备件导出。
|
4 months ago |
|
HuangHuiKang
|
6ff16defb8
|
Merge branch 'hhk' into main
|
4 months ago |
|
HuangHuiKang
|
642fbaea46
|
fix:修复设备详情问题
|
4 months ago |
|
kkk-ops
|
a7c48dd9ae
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
4 months ago |
|
kkk-ops
|
3007d516d0
|
产品新增编码bug
|
4 months ago |
|
HuangHuiKang
|
204f1e29f6
|
Merge branch 'hhk' into main
|
4 months ago |
|
HuangHuiKang
|
5e97c443be
|
feat：完成点检、保养列表及导出接口。修改维修单添加维修结果。
|
4 months ago |
|
86158
|
a80e542c6d
|
Merge branch 'plp'
# Conflicts:
# yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/zjitem/ZjItemController.java
# yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjitem/ZjItemService.java
# yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/zjitem/ZjItemServiceImpl.java
|
4 months ago |
|
86158
|
8c05d91a72
|
完成了质量管理-检验方案
|
4 months ago |
|
kkk-ops
|
fcf8277bcb
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
4 months ago |
|
kkk-ops
|
5756c7e07c
|
质检项目
|
4 months ago |
|
86158
|
0f11edf84a
|
完成了模具详情
|
4 months ago |
|
HuangHuiKang
|
e0e7462273
|
feat：完成工单管理定时任务
|
4 months ago |
|
kkk-ops
|
ff8e320ff6
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
4 months ago |
|
HuangHuiKang
|
5ea07a4e7f
|
Merge branch 'hhk' into main
|
4 months ago |
|
HuangHuiKang
|
4a2dd23e5c
|
fix:修复报错
|
4 months ago |
|
kkk-ops
|
41ab78fa36
|
merge
|
4 months ago |
|
kkk-ops
|
5eee19fb4e
|
上下模
|
4 months ago |
|
HuangHuiKang
|
dbd85b6665
|
Merge branch 'hhk' into main
|
4 months ago |
|
HuangHuiKang
|
e6143eea06
|
feat：添加设备管理相关列表
|
4 months ago |
|
86158
|
63cdba237e
|
Merge branch 'plp'
|
4 months ago |
|
86158
|
69a5fc3689
|
完成了模具维修
|
4 months ago |
|
HuangHuiKang
|
685d224ac1
|
feat：完成能耗报表
|
4 months ago |
|
kkk-ops
|
875a5c92bc
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
4 months ago |
|
kkk-ops
|
1bdfafac25
|
模具入库
|
4 months ago |
|
HuangHuiKang
|
e31bf6543c
|
Merge branch 'hhk' into main
|
4 months ago |
|
HuangHuiKang
|
c5be8a8dd8
|
feat：完成能耗报表相关接口，修复树形结构相关问题
|
4 months ago |
|
86158
|
b5804ebf85
|
Merge branch 'plp'
|
4 months ago |
|
86158
|
025e5e6af0
|
完善了模具点检
|
4 months ago |
|
kkk-ops
|
bb709e000c
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
4 months ago |
|
kkk-ops
|
83fb4f6573
|
设备备件
|
4 months ago |
|
HuangHuiKang
|
72d1836fd3
|
Merge branch 'hhk' into main
|
4 months ago |
|
HuangHuiKang
|
be869fa985
|
feat：完成修改表管理相关接口
|
4 months ago |
|
86158
|
d7bb0d5163
|
Merge branch 'plp'
|
4 months ago |
|
86158
|
820efaa232
|
完成了模具点检
|
4 months ago |