qinyulong
|
9722720ebb
|
设备台账表加入字段设备位置，作业中心ID
|
3 months ago |
|
qinyulong
|
9397872131
|
枚举类取值逻辑修改
|
3 months ago |
|
qinyulong
|
c7bbf4725f
|
Merge branch 'refs/heads/master' into dev-qinyulong
|
3 months ago |
|
qinyulong
|
ba11b71228
|
岗位证书维护检索功能+定时任务更新岗位证书维护状态
|
3 months ago |
Tom Li
|
22185044f4
|
Merge branch 'develop-QA'
|
3 months ago |
|
Tom Li
|
9e048089fb
|
Merge branch 'master' into develop-QA
|
3 months ago |
|
Tom Li
|
902d227e31
|
质量模块。
|
3 months ago |
|
qinyulong
|
35d377cacf
|
培训记录特定检索
|
3 months ago |
|
qinyulong
|
92572cd398
|
导入人员岗位+技能、婚姻枚举
|
3 months ago |
|
qinyulong
|
24ed89e377
|
根据用户code,从用户缓存取数据。
roleService.getRoleAliases(user.getRoleId())前加非空判断
|
3 months ago |
|
Tom Li
|
c9093a32af
|
Merge branch 'develop-QA'
|
3 months ago |
|
Tom Li
|
3a0e594c51
|
Merge branch 'master' into develop-QA
|
3 months ago |
|
Tom Li
|
b90ad7f9c4
|
质量模块相关。
|
3 months ago |
|
Tom Li
|
407e58ccef
|
添加物理删除相关方法。
|
3 months ago |
|
Tom Li
|
bf94219313
|
添加物理删除相关方法。
|
3 months ago |
|
Tom Li
|
626531858d
|
通过[作业中心]id 查询 作业槽List
|
3 months ago |
|
qinyulong
|
b2aa5fcd02
|
批量转岗计划+批量下岗计划
|
3 months ago |
|
qinyulong
|
388411a1f9
|
转岗管理：实习工转正功能+人员转岗添加功能
|
3 months ago |
|
qinyulong
|
60376b9094
|
人员工位管理状态、用工类型、培训状态枚举类
|
3 months ago |
|
qinyulong
|
9e61dfb5c1
|
岗位处理、培训安排、证书类型、培训计划模板、岗位证书维护、岗位设备维护表结构创建sql+逆向代码生成
|
3 months ago |
|
Tom Li
|
2c2bb858b7
|
整理mapper。
|
3 months ago |
|
Tom Li
|
9fd5da3412
|
Merge branch 'develop-QA'
|
3 months ago |
|
Tom Li
|
17edb5df6a
|
Merge branch 'master' into develop-QA
解决字段冲突。
# Conflicts:
# blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java
# blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.xml
|
3 months ago |
|
Tom Li
|
593f16d499
|
移动pojo位置。
|
3 months ago |
|
Tom Li
|
54ddc488de
|
字段冲突。
|
3 months ago |
sunjianxi
|
9999b44ca6
|
排产相关-sjx
|
3 months ago |
|
sunjianxi
|
1df70a1e4f
|
排产相关-sjx
|
3 months ago |
sugy
|
918691bc8f
|
安环管理
|
3 months ago |
|
qinyulong
|
24780aa945
|
记录仪曲线历史返回VO实体类修改
|
3 months ago |
|
qinyulong
|
59cb186288
|
Merge branch 'refs/heads/master' into dev-qinyulong
|
3 months ago |
|
qinyulong
|
4cb88e72e9
|
记录仪记录明细代码逆向生成+记录仪历史曲线
|
3 months ago |
|
qinyulong
|
8ae14ae51a
|
误触
|
3 months ago |
|
qinyulong
|
2bcb98a45d
|
量具使用记录查询条件增加
|
3 months ago |
|
Tom Li
|
f4c21bcfd2
|
Merge branch 'master' into develop-QA
|
3 months ago |
|
Tom Li
|
abcfdc64a7
|
基础数据 修复部分，审理单，生产质量检验。
|
3 months ago |
|
qinyulong
|
045c9d7c1a
|
记录仪曲线设置检索条件增加
|
3 months ago |
|
sunjianxi
|
a019ee7a4f
|
排产相关-sjx
|
3 months ago |
|
qinyulong
|
52648b80ee
|
记录仪曲线设置根据设备编号批量新增入参修改
|
3 months ago |
|
sunjianxi
|
02a6c1bbe7
|
排产相关-sjx
|
3 months ago |
|
qinyulong
|
4b416df9c6
|
记录仪曲线设置根据设备编号批量新增
|
3 months ago |
|
qinyulong
|
ec5781782a
|
记录仪类型、记录仪曲线设置导出
|
3 months ago |
|
qinyulong
|
e4769bab22
|
设备台账导出+字典值新增sql
|
3 months ago |
|
qinyulong
|
30e633480c
|
飞靶、挂具导出+字典值新增sql
|
3 months ago |
|
qinyulong
|
235f6dc9a6
|
挂具状态回显
|
3 months ago |
|
qinyulong
|
9792236717
|
飞靶状态回显
|
3 months ago |
|
qinyulong
|
9c78146ec9
|
修改设备IP
|
3 months ago |
|
Tom Li
|
7d231f19a5
|
Merge branch 'master' into develop-QA
|
3 months ago |
|
Tom Li
|
7db431342f
|
补全基础数据模块。
|
3 months ago |
|
qinyulong
|
a3203854c5
|
设备台账检索条件增加
|
3 months ago |
|
qinyulong
|
584ed78196
|
飞靶和挂具：删除字段fsName和rsName，fsType和rsType就是名称
|
3 months ago |
