Commit Graph

7199 Commits (release)
 

Author SHA1 Message Date
HuangHuiKang 67116f2bd4 Merge branch 'main' into release 2 days ago
HuangHuiKang 50fa59507e fix:修复打印模板问题 2 days ago
HuangHuiKang b9c81c4ea3 fix:修改dev配置文件 3 days ago
HuangHuiKang 0fd7b2c998 Merge branch 'main' into mcm 3 days ago
HuangHuiKang 5996a0b532 fix:关闭线上接口文档访问 3 days ago
liutao d0752db094 Merge remote-tracking branch 'origin/main' 3 days ago
HuangHuiKang 704e3dcd27 feat:新增初始化sql文件 4 days ago
HuangHuiKang 01e1533304 fix:新增报表模板管理模块 4 days ago
liutao 06c83b3303 分类增加导入功能 5 days ago
HuangHuiKang ed352141e0 fix:菜单权限问题 5 days ago
HuangHuiKang 84c6c16278 feat:app端权限管理修改及功能导航模块 5 days ago
liutao 3984fbe953 增加昨日的数据对比 1 week ago
liutao ab4d198ee2 能耗实体类 1 week ago
liutao 8546d1e67e 能源概览接口 1 week ago
HuangHuiKang 8fcf74187b feat:新增打印模板相关接口 2 weeks ago
HuangHuiKang 4b08408511 feat:优化app概况接口 2 weeks ago
HuangHuiKang 13183a6a2a feat:添加app质量概况接口 2 weeks ago
HuangHuiKang 1ea54b1f57 fix:修改产能报表 2 weeks ago
HuangHuiKang a7863b39b5 feat:添加产能报表相关接口 2 weeks ago
HuangHuiKang dbc47aa249 fix:优化产能时间 2 weeks ago
liutao 0af3e8757f Merge remote-tracking branch 'origin/main' 2 weeks ago
liutao 9585c9eb96 优化代码 2 weeks ago
liutao 719cfb797e 设备运行总览 2 weeks ago
liutao b85e6e7360 设备运行概览接口 2 weeks ago
HuangHuiKang 380a4a3bd1 fix:修改prod配置文件 2 weeks ago
liutao 5c1055b821 Merge remote-tracking branch 'origin/main' 2 weeks ago
HuangHuiKang 000aa526e8 fix:修改采集设备产能 3 weeks ago
HuangHuiKang 4dc54fcbc8 fix:添加报工产能回显 3 weeks ago
HuangHuiKang 5ca9c9112a fix:添加报工数、数据采集的产量排产的算法 3 weeks ago
HuangHuiKang 999dd4f12e Merge remote-tracking branch 'origin/main' into main
# 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
3 weeks ago
liutao c40230913f 设备增加图片字段 3 weeks ago
必硕 b84682b9f4 Merge pull request '产品物料信息增加编码搜索条件' (#1) from ck into main
Reviewed-on: #1
4 weeks ago
ck-chenkang 564726280b 产品物料信息增加编码搜索条件 4 weeks ago
liutao a9a910ed8f 防止key为null的情况 4 weeks ago
liutao 77320d3da3 历史记录查询接口 4 weeks ago
HuangHuiKang b67ff2879c fix:优化采集设备分页查询接口 4 weeks ago
HuangHuiKang fcc3cf46c0 feat:新增库区和库位页面 4 weeks ago
HuangHuiKang ec455718f1 fix:app扫码查询相关接口添加编码过滤条件 4 weeks ago
HuangHuiKang c2ec3f0dbf fix:优化app统计报表查询速度 1 month ago
liutao 00f5b71f27 Merge remote-tracking branch 'origin/main' 1 month ago
liutao d85744aba4 增加单设备监控的查询接口 1 month ago
HuangHuiKang 728121dd77 fix:修复已知问题,添加修改计算损耗率。 1 month ago
liutao 15dc437e4e 增加查询采集设备的接口 1 month ago
HuangHuiKang 09a2c8458c fix:修复已知问题,修改添加检验模板关联产品 1 month ago
HuangHuiKang e6197fd60a fix:修复已知问题 1 month ago
HuangHuiKang 92feeb7f84 fix:修改生产整体概况返回 1 month ago
HuangHuiKang a8fb7cd262 feat:完成生产计划报表相关接口 1 month ago
HuangHuiKang ead8061756 feat:完成app统计报表 1 month ago
HuangHuiKang 6923984f8f feat:完成app统计报表 1 month ago
HuangHuiKang 29567d00af fix:修改redis 1 month ago