HuangHuiKang
|
66bc902a07
|
fix:修改采集设备定时任务
|
9 hours ago |
|
HuangHuiKang
|
baadf3c1fe
|
fix：优化修改告警页面分页
|
12 hours ago |
|
HuangHuiKang
|
62eea2d16a
|
fix：优化历史数据分页
|
13 hours 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
|
1 day ago |
|
86158
|
c7ef7a4e97
|
fix:修改模具和模具类型的编码为唯一
|
1 day ago |
|
HuangHuiKang
|
d2c45b0ff2
|
fix：修改模具下模问题
|
1 day ago |
kkk-ops
|
6464295857
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
1 day ago |
|
kkk-ops
|
f4819d840d
|
新增模具页面
|
1 day ago |
|
HuangHuiKang
|
1ad8100be1
|
fix：修改模具上模为多选，新增下模相关接口
|
1 day ago |
|
HuangHuiKang
|
628311098b
|
fix：设备管理模块-新增编码重复问题
|
1 day ago |
|
HuangHuiKang
|
50081338d9
|
fix：tdengine问题
|
2 days ago |
|
kkk-ops
|
6859b3d674
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 days ago |
|
kkk-ops
|
3196ab9fa8
|
项目类型 上下限
|
2 days ago |
|
HuangHuiKang
|
39e66f10a0
|
Merge branch 'hhk' into main
|
2 days ago |
|
HuangHuiKang
|
0745d219e5
|
fix：修复地址编码问题
|
2 days ago |
|
86158
|
e0f96747ca
|
Merge branch 'plp'
|
2 days ago |
|
86158
|
f93c81ed4f
|
feat:新增质检任务的取消功能，修改模具和设备的工单取消功能
|
2 days ago |
|
HuangHuiKang
|
2bd158614a
|
fix：修复bug，添加prod配置文件
|
2 days ago |
|
HuangHuiKang
|
8668c40dfc
|
Merge branch 'main' into hhk
|
2 days ago |
|
HuangHuiKang
|
5c84d87ee5
|
feat:新增大屏告警近七天，产线近七天接口。修改上传接口及文件限制大小。修复相关bug
|
2 days ago |
|
kkk-ops
|
aed851fbc5
|
清除import
|
3 days ago |
|
kkk-ops
|
307ba2b509
|
配方保存bug
|
3 days ago |
|
HuangHuiKang
|
5d92f3cf9d
|
Merge branch 'main' into hhk
|
5 days ago |
|
HuangHuiKang
|
9fa8da65f5
|
feat:新增大屏告警近七天，产线近七天接口。修改上传接口及文件限制大小。修复相关bug
|
5 days ago |
|
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 |