 钮海涛
|
bcf0d45000
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
445821b803
|
sweb问题修复
|
5 years ago |
puxiao.liao
|
08687a7e14
|
修复天津麦格纳BUG
|
5 years ago |
joke.wang
|
c442845f94
|
跳序变更
|
5 years ago |
wynne1005
|
95646d6317
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
汪云昊
|
2b6ff6498c
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
b186af893c
|
feat(softswitch):ftp适配信息优化
|
5 years ago |
|
汪云昊
|
05f493b80e
|
feat(softswitch):添加重试功能
|
5 years ago |
|
wynne1005
|
7fb7db3cb5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
629e6af9a9
|
设备指导操作文件
|
5 years ago |
songss
|
9c1965ea6c
|
11653 19073 安灯导入模板调整
|
5 years ago |
|
puxiao.liao
|
7508796daa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
44b5635e78
|
天津麦格纳PO生产任务增加关联行号
|
5 years ago |
|
钮海涛
|
01d67fdd1f
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
7a29b85848
|
Fix Bug #11733 新增采购订货进度可以编辑原因
|
5 years ago |
宋军超
|
4b65842d6f
|
修改天津麦格纳项目问题
|
5 years ago |
|
wynne1005
|
6750da1d37
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
ebf0392057
|
去除多余optionType枚举
|
5 years ago |
|
puxiao.liao
|
6a42b517fc
|
Fix Task#2839
武汉PRD-WMS&TMS装车明细接口
|
5 years ago |
|
wynne1005
|
470775b527
|
备件生成冲突解决
|
5 years ago |
|
wynne1005
|
f52f07fe77
|
备件导入
|
5 years ago |
|
puxiao.liao
|
c7e5524a0a
|
修复无条码生产扣减增加扣减条码状态只能为入库，合格
|
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 |
 王杰
|
28ff4b551b
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
王杰
|
1dbb826235
|
19048-喷涂工单下发后未给打印状态赋值-20201012
|
5 years ago |
陈思洁
|
e07829e4ea
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
33c59cf39e
|
【11654 MES管理端基础数据模块缺少导入功能 0928】
|
5 years ago |
|
王杰
|
c3bf7efd1c
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
王杰
|
6f3f06a8f6
|
19048-条码补打-补打包装需要可以用过程条码反查包装条码-20201012
|
5 years ago |
|
王杰
|
c90850ea74
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
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 |
|
陈思洁
|
82ae09d2a8
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
陈思洁
|
a3100a71e5
|
【9666 19073-安灯报表：工位统计报表-删除班次、设备。添加故障时长-20200721】
|
5 years ago |
|
钮海涛
|
3d5729e28b
|
自动打印队列增加供应商
|
5 years ago |
|
puxiao.liao
|
90d94f35c8
|
Fix bug#11683
质检单-已收货数量-显示优化
|
5 years ago |
|
钮海涛
|
e628fea5a6
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
5a0178f5df
|
合并dev代码
|
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 |
|
钮海涛
|
401e38203a
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
钮海涛
|
5515f25b79
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
c202fa073b
|
修改sweb问题
|
5 years ago |
|
钮海涛
|
1695d75ff2
|
合并dev代码
|
5 years ago |
|
钮海涛
|
94568777fb
|
合并test代码
|
5 years ago |
|
钮海涛
|
9c7d455998
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |