205 Commits (main)

Author SHA1 Message Date
HuangHuiKang 69a404b872 Merge branch 'hhk' into main 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
kkk-ops a7c48dd9ae Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server 2 weeks ago
kkk-ops 3007d516d0 产品新增编码bug 2 weeks ago
HuangHuiKang 204f1e29f6 Merge branch 'hhk' into main 2 weeks ago
HuangHuiKang 5e97c443be feat:完成点检、保养列表及导出接口。修改维修单添加维修结果。 2 weeks 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 weeks ago
86158 8c05d91a72 完成了质量管理-检验方案 2 weeks ago
kkk-ops fcf8277bcb Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server 3 weeks ago
kkk-ops 5756c7e07c 质检项目 3 weeks ago
86158 0f11edf84a 完成了模具详情 3 weeks ago
HuangHuiKang e0e7462273 feat:完成工单管理定时任务 3 weeks ago
kkk-ops ff8e320ff6 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server 3 weeks ago
HuangHuiKang 5ea07a4e7f Merge branch 'hhk' into main 3 weeks ago
HuangHuiKang 4a2dd23e5c fix:修复报错 3 weeks ago
kkk-ops 41ab78fa36 merge 3 weeks ago
kkk-ops 5eee19fb4e 上下模 3 weeks ago
HuangHuiKang dbd85b6665 Merge branch 'hhk' into main 3 weeks ago
HuangHuiKang e6143eea06 feat:添加设备管理相关列表 3 weeks ago
86158 63cdba237e Merge branch 'plp' 3 weeks ago
86158 69a5fc3689 完成了模具维修 3 weeks ago
HuangHuiKang 685d224ac1 feat:完成能耗报表 3 weeks ago
kkk-ops 875a5c92bc Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server 3 weeks ago
kkk-ops 1bdfafac25 模具入库 3 weeks ago
HuangHuiKang e31bf6543c Merge branch 'hhk' into main 3 weeks ago
HuangHuiKang c5be8a8dd8 feat:完成能耗报表相关接口,修复树形结构相关问题 3 weeks ago
86158 b5804ebf85 Merge branch 'plp' 3 weeks ago
86158 025e5e6af0 完善了模具点检 3 weeks ago
kkk-ops bb709e000c Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server 3 weeks ago
kkk-ops 83fb4f6573 设备备件 3 weeks ago
HuangHuiKang 72d1836fd3 Merge branch 'hhk' into main 3 weeks ago
HuangHuiKang be869fa985 feat:完成修改表管理相关接口 3 weeks ago
86158 d7bb0d5163 Merge branch 'plp' 3 weeks ago
86158 820efaa232 完成了模具点检 3 weeks ago
HuangHuiKang ef6a87bdc5 Merge branch 'main' into hhk 3 weeks ago
HuangHuiKang c560897b89 fix:修复删除逻辑,有被引用的数据不能删除。 3 weeks ago
kkk-ops d9acb82982 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server 3 weeks ago
kkk-ops 7c0ba3f1ce 领模出库 3 weeks ago
HuangHuiKang b58325c344 Merge branch 'hhk' into main 4 weeks ago
HuangHuiKang 76ac1f1c40 fix:修复维修单页面相关问题 4 weeks ago
kkk-ops b56a8062de Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server 4 weeks ago
kkk-ops d2ace5a57e 领料出库 试产质检录入 4 weeks ago
HuangHuiKang c0b49fea37 fix:修复设备管理及采集管理新增设备编码重复问题 4 weeks ago
HuangHuiKang 7342debc26 feat:1.完成关键件页面相关基础接口 2.完成维修项目页面相关基础接口 3.修改维修单页面相关接口 4 weeks ago
kkk-ops 43ae36a62f Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server 4 weeks ago
kkk-ops d091c84aa0 报工修改 4 weeks ago
HuangHuiKang 4d73fe32e1 Merge branch 'hhk' into main 4 weeks ago
HuangHuiKang eac25f752e feat:完成任务管理以及工单管理接口 4 weeks ago
kkk-ops fc267eaefa Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server 4 weeks ago
kkk-ops b91312975e 报工 4 weeks ago
HuangHuiKang a22e9c8052 feat:1、新增设备分类接口 2、新增设备台账接口 3、修改项目维护接口 4、新增方案维护接口 4 weeks ago
HuangHuiKang 404794c86f Merge branch 'hhk' into main 4 weeks ago
HuangHuiKang e54a2fd133 feat:1、新增设备运行参数分析页面 2、恢复定时任务修改
3、修改连不上服务器连不上opcv问题
4 weeks ago
kkk-ops 02b858a459 报工 4 weeks ago
kkk-ops 0f450424ab Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server 4 weeks ago
kkk-ops f9de5651a6 生产计划修改 4 weeks ago
86158 870cb78385 更改 4 weeks ago
kkk-ops 332c735d01 生产计划修改 1 month ago
kkk-ops 4a61b21753 派工修改 1 month ago
kkk-ops df41739244 生产计划 1 month ago
kkk-ops be560924b5 commit 2 months ago
chenyuan ddcc9bf9c1 Merge branch 'dev' of https://gitee.com/chenshuichuan/besure_neimeng into dev 9 months ago
chenyuan d070aa73a2 fix module 1 year ago
chenshuichuan 6a71fa2f6f dev 1 year ago
chenshuichuan 838ac67842 fix alert record 1 year ago
chenshuichuan 0950f5f4a2 fix erp and 供应链大屏 1 year ago
chenshuichuan 1075a43450 fix data 1 year ago
chenshuichuan 49bfcd84c6 add fix 1 year 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
chenshuichuan 3847649533 add mqtt data 2 years ago
chenyuan 1e18240afc add mold record 2 years ago
chenshuichuan 87e34e30ac fix 2 years ago
chenshuichuan 29ba7196af fix 2 years ago
chenshuichuan f9b02681a0 add mqtt data 2 years ago
chenshuichuan 608c464851 fix bug 2 years ago
chenshuichuan d9222fed8f fix filed 2 years ago
chenshuichuan 51192078f9 fix user exprience 2 years ago
chenshuichuan 4682e22278 git fix orgWorker 2 years ago
chenshuichuan 4cd7ebcea8 fix erp 2 years ago
chenshuichuan 40a86bea88 fix energy 2 years ago
chenshuichuan c3c9ac4ecc fix report 2 years ago
chenshuichuan 34713bc663 fix erp 2 years ago
chenshuichuan 344724dee0 fix erp 2 years ago
chenshuichuan cfbb1be200 fix machine field 2 years ago
chenshuichuan 67b0b7c7d7 fix plan 2 years ago
chenshuichuan df390d909a add record 2 years ago
chenshuichuan 37fee69315 fix bugs 2 years ago
chenshuichuan 8b6d6bea45 fix bugs 2 years ago
chenshuichuan 7f47311ff8 fix app create and update report 2 years ago
chenshuichuan e6580bb146 add report 2 years ago
chenshuichuan a4a798664e add app work report 2 years ago
chenshuichuan cdef4910b1 add get plan by status 2 years ago
chenshuichuan 4b163dfb55 fix task plan 2 years ago
chenshuichuan d6a173c070 add energy device 2 years ago