7012 Commits (5e57a231c5932b7cee3afc7b7a4325fe5fe3384f)
 

Author SHA1 Message Date
86158 5e57a231c5 feat:完成大屏设备点位数据接口 5 days ago
kkk-ops 43c6726455 产线关联设备台账 台账关联采集设备 6 days ago
HuangHuiKang 3337c09132 Merge branch 'hhk' into main 6 days ago
HuangHuiKang 65bca4b368 fix:修复采集设备删除问题 6 days ago
HuangHuiKang 23e608df6e Merge branch 'hhk' into main 6 days ago
HuangHuiKang 2984fef8f2 fix:修复bug 6 days ago
HuangHuiKang 5e2676998d Merge branch 'hhk' into main 6 days ago
HuangHuiKang a8ca54bb1f feat:完成大屏产能统计接口、产能近七天趋势图接口、能耗周趋势接口 6 days ago
HuangHuiKang d409357991 Merge branch 'hhk' into main 1 week ago
HuangHuiKang 20d35645a3 feat:完成告警页面、大屏能耗检测统计 1 week ago
86158 8aacbdaa6c fix:模具工单bug 1 week ago
kkk-ops 2f0d11ac29 merge 1 week ago
86158 5bea1b3a23 fix:模具bug 1 week ago
kkk-ops 3cf649ca92 综合大屏 1 week 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
1 week ago
86158 1fa7c0ac2a Merge remote-tracking branch 'origin/main' 1 week ago
86158 9b421a5d66 feat:增加模具导出功能 1 week ago
HuangHuiKang 121c447608 feat:完成大屏各任务统计、各任务列表接口。 1 week ago
86158 8371002507 fix:迁移部分模具功能到common模块 1 week ago
HuangHuiKang d8c5f86c59 fix:优化能耗管理-能源报表接口 1 week ago
kkk-ops 5a27d83074 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server 1 week ago
kkk-ops 9c311b9115 首页 1 week ago
HuangHuiKang ea371faf56 fix:修改导出接口 1 week ago
86158 3104a4fc07 Merge branch 'plp' 1 week ago
86158 bba21f2e4d feat:新增commomn模块 1 week ago
86158 0d23cf3c3c fix:修改表格导出 1 week ago
kkk-ops 86190340ee bug 2 weeks ago
kkk-ops 4248828933 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server 2 weeks ago
kkk-ops 43fb1c2242 首页 2 weeks ago
86158 1e26ada9ce Merge branch 'plp' 2 weeks ago
HuangHuiKang 60b20dfe43 Merge branch 'hhk' into main 2 weeks ago
HuangHuiKang 41f35456ec feat:添加设备运行报表时间字段,新增首页设备运行状态接口 2 weeks ago
HuangHuiKang f24ccb46a5 Merge branch 'hhk' into main 2 weeks ago
HuangHuiKang 27778698a2 feat:完成设备运行报表页面,新增采集设备页面运行状态、采集时间字段 2 weeks ago
86158 e425c12f8b feat:新增可视化大屏 2 weeks ago
HuangHuiKang a61a35cc7d Merge branch 'hhk' into main 2 weeks ago
HuangHuiKang 876dcdd7ca feat:完成定时任务对每个点位的规则判断存入数据库 2 weeks ago
86158 a112373b17 fix:修改了模具详情的点检保养维修履历界面 2 weeks ago
HuangHuiKang 108c207b3d Merge branch 'hhk' into main 2 weeks ago
HuangHuiKang 95dff0da41 feat:完成点位规则接口 2 weeks ago
86158 897e7dffd4 fix:修改了一些质量管理的显示问题 2 weeks ago
HuangHuiKang ca5466e499 Merge branch 'hhk' into main 2 weeks ago
HuangHuiKang ead838a214 fix:修改设备详情负责人显示问题 2 weeks ago
86158 46453c9664 Merge branch 'plp' 2 weeks ago
86158 6c89510fd1 完成了质量管理-检验任务 2 weeks ago
HuangHuiKang 69a404b872 Merge branch 'hhk' into main 2 weeks ago
HuangHuiKang 9fbfb95489 fix:修改点位类型显示问题 2 weeks ago
HuangHuiKang 0f4126a59c feat:完成 1、点检列表、导出。2、保养列表、导出。3、维修列表、导出。4、关键件导出 5、备件导出。 2 weeks ago
HuangHuiKang 6ff16defb8 Merge branch 'hhk' into main 2 weeks ago
HuangHuiKang 642fbaea46 fix:修复设备详情问题 2 weeks ago