陈思洁
|
a6acf3d616
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
82a769cae1
|
【12040 19073-安灯BI界面中事件物料时长，解决时长为-3290，解决在横坐标的下方有问题-20201026】
2887 10 2.3.7安灯通知优化
|
5 years ago |
songss
|
ef316af0c1
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
|
5 years ago |
wynne1005
|
78a3943a3d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
4c86b836ca
|
OP20b逻辑变更 esop展示变更
|
5 years ago |
汪云昊
|
15dc4b00c7
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
ed22bd6f64
|
feat(form):存储过程调用适配mysql,mssql
|
5 years ago |
puxiao.liao
|
ba81af744b
|
北京麦格纳看板
|
5 years ago |
 王杰
|
bb3039d1f2
|
包装关系查询宝贝
|
5 years ago |
 贾文涛
|
2301e03c85
|
增加呼叫不需要弹窗的枚举。
|
5 years ago |
|
songss
|
3e629e63c5
|
控制计划-过程检验逻辑调整
|
5 years ago |
|
wynne1005
|
9629823a79
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
b00bcf66b2
|
图片展示类型
|
5 years ago |
|
汪云昊
|
72e25305bf
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
汪云昊
|
a4bc17b0a6
|
feat(form):sap_hana数据库支持
|
5 years ago |
|
wynne1005
|
05152538b2
|
合并冲突
|
5 years ago |
|
wynne1005
|
fc36e55a38
|
新增mes 报表查询周期枚举
|
5 years ago |
joke.wang
|
df063af038
|
物料类型1增加枚举
|
5 years ago |
|
joke.wang
|
6930fdfbe7
|
mgn-bj 产线枚举优化
|
5 years ago |
 钮海涛
|
61d123cfc8
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
93626dad0f
|
新增质检完成状态报表
|
5 years ago |
|
songss
|
578e2c5155
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
|
5 years ago |
|
songss
|
bfe4b4f069
|
社保故障自动获取任务完善，根据不同等级调用不同的安灯接口
|
5 years ago |
宋军超
|
fcc66835b8
|
开发天津看板功能
|
5 years ago |
|
汪云昊
|
ce054916b4
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
401fccd4dc
|
fix(impp):DdlPreparedPack类处理大于小于错误
|
5 years ago |
|
宋军超
|
d372256a68
|
添加喷涂不良类型枚举
|
5 years ago |
|
宋军超
|
bd9547b825
|
优化天津麦格纳报表
|
5 years ago |
|
陈思洁
|
11b461f1d6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
1706b7a684
|
【2856 10 2.3.8 20027-PCN端工位监控如果报错数据没有采集怎么报警提示】
|
5 years ago |
|
joke.wang
|
233853e1e6
|
库存排程
|
5 years ago |
|
陈思洁
|
30f8e332fa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
8f060d4aa4
|
【2856 10 2.3.8 20027-PCN端工位监控如果报错数据没有采集怎么报警提示】
|
5 years ago |
|
joke.wang
|
c442845f94
|
跳序变更
|
5 years ago |
|
汪云昊
|
2b6ff6498c
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
05f493b80e
|
feat(softswitch):添加重试功能
|
5 years ago |
|
wynne1005
|
ebf0392057
|
去除多余optionType枚举
|
5 years ago |
|
wynne1005
|
470775b527
|
备件生成冲突解决
|
5 years ago |
|
wynne1005
|
f52f07fe77
|
备件导入
|
5 years ago |
|
汪云昊
|
e97a1193e1
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
27088d2db5
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
e97369585d
|
fix(core):在用户未登录时国际化无效
|
5 years ago |
|
王杰
|
1dbb826235
|
19048-喷涂工单下发后未给打印状态赋值-20201012
|
5 years ago |
|
陈思洁
|
33c59cf39e
|
【11654 MES管理端基础数据模块缺少导入功能 0928】
|
5 years ago |
|
wynne1005
|
d36a7527a6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
c117515b69
|
设备自动报警
|
5 years ago |
|
songss
|
a5b81cb676
|
解决代码冲突
|
5 years ago |
|
songss
|
966ed3536b
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
|
5 years ago |
|
songss
|
5816f275bf
|
新增控制计划相关接口
|
5 years ago |
|
钮海涛
|
af4bb83f85
|
sweb合并test代码
|
5 years ago |