185 Commits (2984fef8f2469adbbc1f7be3956d4342447b0c3c)

Author SHA1 Message Date
HuangHuiKang 2984fef8f2 fix:修复bug 3 months ago
HuangHuiKang a8ca54bb1f feat:完成大屏产能统计接口、产能近七天趋势图接口、能耗周趋势接口 3 months ago
HuangHuiKang 20d35645a3 feat:完成告警页面、大屏能耗检测统计 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 3 months ago
kkk-ops 4248828933 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server 3 months ago
kkk-ops 43fb1c2242 首页 3 months ago
86158 e425c12f8b feat:新增可视化大屏 3 months ago
HuangHuiKang a61a35cc7d Merge branch 'hhk' into main 3 months ago
HuangHuiKang 876dcdd7ca feat:完成定时任务对每个点位的规则判断存入数据库 3 months ago
86158 a112373b17 fix:修改了模具详情的点检保养维修履历界面 3 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