liutao
|
24f11f4deb
|
Merge remote-tracking branch 'origin/main'
|
2 months ago |
|
liutao
|
e99d6e36c0
|
关键件增加图片上传
|
2 months ago |
HuangHuiKang
|
a86d70c0a6
|
feat:新增数据采集产能
|
2 months ago |
|
liutao
|
5b7456c50a
|
实体类增加字段
|
2 months ago |
|
HuangHuiKang
|
977a16e6c9
|
feat:新增排产功能模块相关字段，修改新增计划接口
|
2 months ago |
|
liutao
|
04cc023b4f
|
查询大屏接口取消拦截
|
2 months ago |
|
HuangHuiKang
|
00681c954e
|
feat:新增生成二维码功能
|
3 months ago |
|
liutao
|
a2ddb3e276
|
esop文件管理功能
|
3 months ago |
|
liutao
|
35b9c1429a
|
节假日设置返回值常量
|
3 months ago |
|
liutao
|
bc149dd049
|
节假日设置增删改查
|
3 months ago |
|
HuangHuiKang
|
b9e72e30e1
|
fix:修复已知bug
|
3 months ago |
|
HuangHuiKang
|
fa9d61e75d
|
fix:修改设备管理-维修项目为多选设备
|
3 months ago |
|
HuangHuiKang
|
8d816aefa0
|
fix:修复已知bug-03-10
|
3 months ago |
|
HuangHuiKang
|
89e8024282
|
fix:修复已知bug-1
|
3 months ago |
|
HuangHuiKang
|
827dd9a071
|
fix:修复已知bug
|
3 months ago |
|
HuangHuiKang
|
cc7e96e135
|
fix:修改厂区结构可以选空设备
|
3 months ago |
|
HuangHuiKang
|
5778e72827
|
fix:修复已知问题
|
3 months ago |
|
HuangHuiKang
|
d0b80b5cb7
|
fix:修复已知bug
|
4 months ago |
|
HuangHuiKang
|
8a4d5e68a4
|
fix:修复已知bug
|
4 months ago |
|
HuangHuiKang
|
a516af0632
|
fix:修复已知bug
|
4 months ago |
|
HuangHuiKang
|
77fb65d631
|
perf:减少项目启动时间
|
4 months ago |
|
HuangHuiKang
|
d0569d9d0a
|
fix:1、修改能耗管理-能耗报表，读取数据逻辑 2、修改总览大屏-能耗周趋势接口 3、修改产线大屏-能耗监测接口
|
4 months ago |
86158
|
3a65a27e17
|
fix:修改大屏设备点位数据接口
|
4 months ago |
kkk-ops
|
e062c42740
|
组织-采集设备
|
4 months ago |
|
kkk-ops
|
631211af89
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
# Conflicts:
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceService.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java
|
4 months ago |
|
kkk-ops
|
100331b455
|
commit
|
4 months ago |
|
HuangHuiKang
|
b1a5f45b15
|
Merge branch 'hhk' into main
# Conflicts:
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/vo/DeviceRespVO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/device/DeviceDO.java
# yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java
|
4 months ago |
|
HuangHuiKang
|
572ff4c3dd
|
fix:修改读取数据方式opcuva为mqtt
|
4 months ago |
|
kkk-ops
|
3d4a8fb65c
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
4 months ago |
|
kkk-ops
|
03f839ed61
|
设备运行报表
|
4 months ago |
|
86158
|
ac9c0fdc7a
|
fix：质量管理-检验类型和检验任务编码重复问题
|
4 months ago |
|
HuangHuiKang
|
fc4769a464
|
Merge branch 'hhk' into main
|
4 months ago |
|
86158
|
1a9dadec7e
|
Merge branch 'plp'
# Conflicts:
# yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/criticalcomponent/CriticalComponentServiceImpl.java
|
4 months ago |
|
86158
|
1b9e55c492
|
feat：新增了采集设备模型-采集点、设备管理-设备关键件、备件管理-备件信息的数据导入功能
|
4 months ago |
|
HuangHuiKang
|
1e060796a0
|
fix:设备管理-任务管理-新增corn表达式不能小于一小时
|
4 months ago |
|
HuangHuiKang
|
d2c45b0ff2
|
fix：修改模具下模问题
|
4 months ago |
|
kkk-ops
|
6464295857
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
4 months ago |
|
kkk-ops
|
f4819d840d
|
新增模具页面
|
4 months ago |
|
HuangHuiKang
|
1ad8100be1
|
fix：修改模具上模为多选，新增下模相关接口
|
4 months ago |
|
HuangHuiKang
|
628311098b
|
fix：设备管理模块-新增编码重复问题
|
4 months ago |
|
kkk-ops
|
6859b3d674
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
4 months ago |
|
kkk-ops
|
3196ab9fa8
|
项目类型 上下限
|
4 months ago |
|
86158
|
e0f96747ca
|
Merge branch 'plp'
|
4 months ago |
|
86158
|
f93c81ed4f
|
feat:新增质检任务的取消功能，修改模具和设备的工单取消功能
|
4 months ago |
|
HuangHuiKang
|
2bd158614a
|
fix：修复bug，添加prod配置文件
|
4 months ago |
|
kkk-ops
|
aed851fbc5
|
清除import
|
4 months ago |
|
kkk-ops
|
307ba2b509
|
配方保存bug
|
4 months ago |
|
HuangHuiKang
|
5d92f3cf9d
|
Merge branch 'main' into hhk
|
4 months ago |
|
HuangHuiKang
|
9fa8da65f5
|
feat:新增大屏告警近七天，产线近七天接口。修改上传接口及文件限制大小。修复相关bug
|
4 months ago |
|
86158
|
5e57a231c5
|
feat:完成大屏设备点位数据接口
|
4 months ago |