qinyulong
|
8d52e46d35
|
Merge remote-tracking branch 'origin/master'
|
3 months ago |
|
qinyulong
|
dd14d4e096
|
Merge branch 'refs/heads/dev-qinyulong'
|
3 months ago |
sunjianxi
|
30648c7800
|
配置文件修改-sjx
|
3 months ago |
|
sunjianxi
|
c1a44a530d
|
Merge remote-tracking branch 'origin/master'
|
3 months ago |
|
sunjianxi
|
9a6ea64d70
|
排产看板订单优先级修改-sjx
|
3 months ago |
Tom Li
|
188d5c8ce6
|
修改 槽液任务。
|
3 months ago |
|
Tom Li
|
e4b4b18f15
|
修复 槽液任务相关问题。
|
3 months ago |
|
qinyulong
|
6fa307e0e6
|
同步IOT设备信息,同步equ飞靶信息
|
3 months ago |
liweidong-hj
|
19896db778
|
工艺提交
|
3 months ago |
liuqingkun
|
b693da98fd
|
Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr
|
3 months ago |
|
liuqingkun
|
0157631aaf
|
erpdata模块数据初始化
|
3 months ago |
|
qinyulong
|
85b574e3a9
|
用户缓存无法命中，封装异常信息
|
3 months ago |
|
Tom Li
|
631500152a
|
修改常量位置。
|
3 months ago |
|
Tom Li
|
ff95983768
|
修改 质量模块问题。
|
3 months ago |
|
Tom Li
|
d19876cb46
|
修复请求日期问题。
|
3 months ago |
|
qinyulong
|
843716dd74
|
模板下载路径修改
|
3 months ago |
|
qinyulong
|
d9d3696273
|
Merge branch 'refs/heads/master' into dev-qinyulong
|
3 months ago |
|
qinyulong
|
b0dbd5dcde
|
转岗管理：设备维护导入功能
|
3 months ago |
|
Tom Li
|
a76db32ce1
|
Merge branch 'develop-QA'
|
3 months ago |
|
Tom Li
|
1dac2aff03
|
Merge branch 'master' into develop-QA
|
3 months ago |
|
Tom Li
|
b57d8d9add
|
质量模块 提交。
|
3 months ago |
sugy
|
574c79be75
|
修改查询
|
3 months ago |
|
qinyulong
|
4d36eeaac3
|
上岗证维护导入功能
|
3 months ago |
|
qinyulong
|
cdeb5b8a6b
|
更改包路径为全小写
|
3 months ago |
|
sunjianxi
|
157fa60c2c
|
修改文件路径-sjx
|
3 months ago |
|
liuqingkun
|
3eafa13e5d
|
添加排产数据同步到新mes
1. 生产订单状态
2. 车间订单调度
|
3 months ago |
|
Tom Li
|
9234f26201
|
质量相关问题修改。
|
3 months ago |
|
qinyulong
|
e68650294d
|
Merge branch 'refs/heads/dev-qinyulong'
|
3 months ago |
|
qinyulong
|
ff86d4cc44
|
多状态查询人员岗位管理
|
3 months ago |
|
sunjianxi
|
3b006e9026
|
排产相关-sjx
|
3 months ago |
|
qinyulong
|
f157b3659f
|
Merge branch 'refs/heads/master' into dev-qinyulong
|
3 months ago |
|
qinyulong
|
66bf3601b0
|
主键id缺失
|
3 months ago |
|
sunjianxi
|
84711d5c4a
|
排产相关-sjx
|
3 months ago |
|
qinyulong
|
b24757a1f8
|
多能工查询
|
3 months ago |
|
qinyulong
|
92e2aa2de0
|
Merge branch 'refs/heads/master' into dev-qinyulong
|
3 months ago |
|
qinyulong
|
b6e6554de3
|
转岗功能修改
|
3 months ago |
|
sunjianxi
|
fe4a62d3c7
|
排产相关-sjx
|
3 months ago |
|
Tom Li
|
3d1120a6f6
|
Merge branch 'master' into develop-QA
|
3 months ago |
|
Tom Li
|
9c0941f05d
|
质量模块。
|
3 months ago |
|
qinyulong
|
2d59d4ee12
|
Merge branch 'refs/heads/master' into dev-qinyulong
# Conflicts:
# doc/sql/mes/increase-260113.sql
|
3 months ago |
|
qinyulong
|
b28bdc17c4
|
人员岗位管理加字段：性别，手机号+计算入职工作时长、社会工作时长、合同到期时长+表结构变更sql语句
|
3 months ago |
|
Tom Li
|
4100dfed1e
|
Merge branch 'master' into develop-QA
|
3 months ago |
|
Tom Li
|
29e5b24dd4
|
保存字段。
|
3 months ago |
|
qinyulong
|
ae684dc6e5
|
岗位证书维护导入功能
|
3 months ago |
|
Tom Li
|
e0e672ccce
|
质量模块。
|
3 months ago |
|
sugy
|
2ea90d207b
|
修改安环加药导入
|
3 months ago |
|
qinyulong
|
48384059b6
|
培训计划模板导出，岗位证书维护导出，岗位设备维护导出+转岗管理相关状态字典数据sql
|
3 months ago |
|
Tom Li
|
9a799ba08a
|
质量模块。
|
3 months ago |
|
sugy
|
f4f04ace01
|
修改安环废水废弃查询
|
3 months ago |
|
Tom Li
|
3a001cb112
|
生产处置单相关。
|
3 months ago |
