kkk-ops
|
3cf649ca92
|
综合大屏
|
2 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
|
2 months ago |
|
86158
|
1fa7c0ac2a
|
Merge remote-tracking branch 'origin/main'
|
2 months ago |
HuangHuiKang
|
121c447608
|
feat:完成大屏各任务统计、各任务列表接口。
|
2 months ago |
|
86158
|
8371002507
|
fix:迁移部分模具功能到common模块
|
2 months ago |
|
HuangHuiKang
|
d8c5f86c59
|
fix:优化能耗管理-能源报表接口
|
2 months ago |
|
kkk-ops
|
5a27d83074
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 months ago |
|
kkk-ops
|
9c311b9115
|
首页
|
2 months ago |
|
HuangHuiKang
|
ea371faf56
|
fix:修改导出接口
|
2 months ago |
|
86158
|
3104a4fc07
|
Merge branch 'plp'
|
2 months ago |
|
86158
|
0d23cf3c3c
|
fix:修改表格导出
|
2 months ago |
|
kkk-ops
|
86190340ee
|
bug
|
2 months ago |
|
kkk-ops
|
4248828933
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 months ago |
|
kkk-ops
|
43fb1c2242
|
首页
|
2 months ago |
|
86158
|
e425c12f8b
|
feat:新增可视化大屏
|
2 months ago |
|
HuangHuiKang
|
a61a35cc7d
|
Merge branch 'hhk' into main
|
2 months ago |
|
HuangHuiKang
|
876dcdd7ca
|
feat:完成定时任务对每个点位的规则判断存入数据库
|
2 months ago |
|
86158
|
a112373b17
|
fix:修改了模具详情的点检保养维修履历界面
|
2 months ago |
|
HuangHuiKang
|
108c207b3d
|
Merge branch 'hhk' into main
|
2 months ago |
|
HuangHuiKang
|
95dff0da41
|
feat:完成点位规则接口
|
2 months ago |
|
86158
|
897e7dffd4
|
fix:修改了一些质量管理的显示问题
|
2 months ago |
|
HuangHuiKang
|
ca5466e499
|
Merge branch 'hhk' into main
|
2 months ago |
|
HuangHuiKang
|
ead838a214
|
fix:修改设备详情负责人显示问题
|
2 months ago |
|
86158
|
46453c9664
|
Merge branch 'plp'
|
2 months ago |
|
86158
|
6c89510fd1
|
完成了质量管理-检验任务
|
2 months ago |
|
HuangHuiKang
|
69a404b872
|
Merge branch 'hhk' into main
|
2 months ago |
|
HuangHuiKang
|
0f4126a59c
|
feat:完成 1、点检列表、导出。2、保养列表、导出。3、维修列表、导出。4、关键件导出 5、备件导出。
|
2 months ago |
|
HuangHuiKang
|
6ff16defb8
|
Merge branch 'hhk' into main
|
2 months ago |
|
HuangHuiKang
|
642fbaea46
|
fix:修复设备详情问题
|
2 months ago |
|
kkk-ops
|
a7c48dd9ae
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 months ago |
|
kkk-ops
|
3007d516d0
|
产品新增编码bug
|
2 months ago |
|
HuangHuiKang
|
204f1e29f6
|
Merge branch 'hhk' into main
|
2 months ago |
|
HuangHuiKang
|
5e97c443be
|
feat：完成点检、保养列表及导出接口。修改维修单添加维修结果。
|
2 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
|
2 months ago |
|
86158
|
8c05d91a72
|
完成了质量管理-检验方案
|
2 months ago |
|
kkk-ops
|
fcf8277bcb
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 months ago |
|
kkk-ops
|
5756c7e07c
|
质检项目
|
2 months ago |
|
86158
|
0f11edf84a
|
完成了模具详情
|
2 months ago |
|
HuangHuiKang
|
e0e7462273
|
feat：完成工单管理定时任务
|
2 months ago |
|
kkk-ops
|
ff8e320ff6
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 months ago |
|
HuangHuiKang
|
5ea07a4e7f
|
Merge branch 'hhk' into main
|
2 months ago |
|
HuangHuiKang
|
4a2dd23e5c
|
fix:修复报错
|
2 months ago |
|
kkk-ops
|
41ab78fa36
|
merge
|
2 months ago |
|
kkk-ops
|
5eee19fb4e
|
上下模
|
2 months ago |
|
HuangHuiKang
|
dbd85b6665
|
Merge branch 'hhk' into main
|
2 months ago |
|
HuangHuiKang
|
e6143eea06
|
feat：添加设备管理相关列表
|
2 months ago |
|
86158
|
63cdba237e
|
Merge branch 'plp'
|
2 months ago |
|
86158
|
69a5fc3689
|
完成了模具维修
|
2 months ago |
|
HuangHuiKang
|
685d224ac1
|
feat：完成能耗报表
|
2 months ago |
|
kkk-ops
|
875a5c92bc
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 months ago |
|
kkk-ops
|
1bdfafac25
|
模具入库
|
2 months ago |
|
HuangHuiKang
|
e31bf6543c
|
Merge branch 'hhk' into main
|
2 months ago |
|
HuangHuiKang
|
c5be8a8dd8
|
feat：完成能耗报表相关接口，修复树形结构相关问题
|
2 months ago |
|
86158
|
b5804ebf85
|
Merge branch 'plp'
|
2 months ago |
|
86158
|
025e5e6af0
|
完善了模具点检
|
2 months ago |
|
kkk-ops
|
bb709e000c
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 months ago |
|
kkk-ops
|
83fb4f6573
|
设备备件
|
2 months ago |
|
HuangHuiKang
|
72d1836fd3
|
Merge branch 'hhk' into main
|
2 months ago |
|
HuangHuiKang
|
be869fa985
|
feat：完成修改表管理相关接口
|
2 months ago |
|
86158
|
d7bb0d5163
|
Merge branch 'plp'
|
2 months ago |
|
86158
|
820efaa232
|
完成了模具点检
|
2 months ago |
|
HuangHuiKang
|
ef6a87bdc5
|
Merge branch 'main' into hhk
|
2 months ago |
|
HuangHuiKang
|
c560897b89
|
fix:修复删除逻辑，有被引用的数据不能删除。
|
2 months ago |
|
kkk-ops
|
d9acb82982
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 months ago |
|
kkk-ops
|
7c0ba3f1ce
|
领模出库
|
2 months ago |
|
HuangHuiKang
|
b58325c344
|
Merge branch 'hhk' into main
|
2 months ago |
|
HuangHuiKang
|
76ac1f1c40
|
fix:修复维修单页面相关问题
|
2 months ago |
|
kkk-ops
|
b56a8062de
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 months ago |
|
kkk-ops
|
d2ace5a57e
|
领料出库 试产质检录入
|
2 months ago |
|
HuangHuiKang
|
c0b49fea37
|
fix:修复设备管理及采集管理新增设备编码重复问题
|
2 months ago |
|
HuangHuiKang
|
7342debc26
|
feat:1.完成关键件页面相关基础接口 2.完成维修项目页面相关基础接口 3.修改维修单页面相关接口
|
2 months ago |
|
kkk-ops
|
43ae36a62f
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 months ago |
|
kkk-ops
|
d091c84aa0
|
报工修改
|
2 months ago |
|
HuangHuiKang
|
4d73fe32e1
|
Merge branch 'hhk' into main
|
2 months ago |
|
HuangHuiKang
|
eac25f752e
|
feat:完成任务管理以及工单管理接口
|
2 months ago |
|
kkk-ops
|
fc267eaefa
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 months ago |
|
kkk-ops
|
b91312975e
|
报工
|
2 months ago |
|
HuangHuiKang
|
a22e9c8052
|
feat:1、新增设备分类接口 2、新增设备台账接口 3、修改项目维护接口 4、新增方案维护接口
|
2 months ago |
|
HuangHuiKang
|
404794c86f
|
Merge branch 'hhk' into main
|
2 months ago |
|
HuangHuiKang
|
e54a2fd133
|
feat:1、新增设备运行参数分析页面 2、恢复定时任务修改
3、修改连不上服务器连不上opcv问题
|
2 months ago |
|
kkk-ops
|
02b858a459
|
报工
|
2 months ago |
|
kkk-ops
|
0f450424ab
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
3 months ago |
|
kkk-ops
|
f9de5651a6
|
生产计划修改
|
3 months ago |
|
86158
|
870cb78385
|
更改
|
3 months ago |
|
kkk-ops
|
332c735d01
|
生产计划修改
|
3 months ago |
|
kkk-ops
|
4a61b21753
|
派工修改
|
3 months ago |
|
kkk-ops
|
df41739244
|
生产计划
|
3 months ago |
|
kkk-ops
|
be560924b5
|
commit
|
3 months ago |
chenyuan
|
ddcc9bf9c1
|
Merge branch 'dev' of https://gitee.com/chenshuichuan/besure_neimeng into dev
|
10 months ago |
|
chenyuan
|
d070aa73a2
|
fix module
|
1 year ago |
|
chenshuichuan
|
6a71fa2f6f
|
dev
|
1 year ago |
|
chenshuichuan
|
838ac67842
|
fix alert record
|
2 years ago |
|
chenshuichuan
|
0950f5f4a2
|
fix erp and 供应链大屏
|
2 years ago |
|
chenshuichuan
|
1075a43450
|
fix data
|
2 years ago |
|
chenshuichuan
|
49bfcd84c6
|
add fix
|
2 years ago |
|
chenshuichuan
|
cf76143626
|
fix device and alert
|
2 years ago |
|
chenshuichuan
|
101a3084a0
|
add 维保
|
2 years ago |
|
chenshuichuan
|
8bf81f1416
|
add device component
|
2 years ago |
|
chenshuichuan
|
16a12628eb
|
add mold record
|
2 years ago |
|
chenshuichuan
|
5b86719c7c
|
fix mqtt data
|
2 years ago |