wynne1005
|
b43317c11a
|
还原pom
|
5 years ago |
|
wynne1005
|
5f80cc4322
|
Merge branch 'dev' into test
|
5 years ago |
陈思洁
|
759cb39827
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
260899368d
|
【8685 05 2.3.3.6 队列条码打印-管理端-查、打印】
|
5 years ago |
|
wynne1005
|
2d69c3ab18
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
6b9d56f9e0
|
自测修改
|
5 years ago |
joke.wang
|
00ca9bef40
|
Finish Task #1960 Cost:16h
|
5 years ago |
宋军超
|
56dec41ad0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
f5074fba08
|
Finish Task #1898 Cost:16h
|
5 years ago |
|
陈思洁
|
94c7526d65
|
【盲检工步】
|
5 years ago |
|
陈思洁
|
4d4469ebc9
|
【合并冲突】
|
5 years ago |
|
陈思洁
|
3848c6da14
|
【盲检工步】
|
5 years ago |
|
宋军超
|
febbb549fc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
612d768999
|
Start Task #1932 Cost:5h Left:3h
|
5 years ago |
|
joke.wang
|
a8241a1694
|
Start Task #1960 Cost:8h Left:8h
|
5 years ago |
袁津哲
|
399c9c828e
|
Fix Bug #1916,1917
|
5 years ago |
|
宋军超
|
c2a5a17379
|
工步参数添加工步弹框参数字段
|
5 years ago |
|
joke.wang
|
342e5f7ab2
|
Effort Task #1915 Cost:2h Left:0h
|
5 years ago |
|
wynne1005
|
8ef3997038
|
还原pom
|
5 years ago |
|
wynne1005
|
4150543cb4
|
Effort Task #1940 Cost:16h Left:8h
|
5 years ago |
 钮海涛
|
4d26c95639
|
Merge branch 'test' into dev
|
5 years ago |
|
joke.wang
|
d4f0ef157a
|
Finish Task #1915 Cost:8h
|
5 years ago |
|
宋军超
|
659b893903
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
b05113f63c
|
Finish Task #1887 Cost:16h
|
5 years ago |
|
钮海涛
|
47131ff13f
|
修复版本问题
|
5 years ago |
|
袁津哲
|
37092cf2c5
|
Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能
|
5 years ago |
|
袁津哲
|
d65a5a3784
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
|
5 years ago |
|
袁津哲
|
44f313abc4
|
Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能
|
5 years ago |
|
宋军超
|
9eda1f67b7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
40672559e4
|
修改sonar--BUG类型问题
|
5 years ago |
|
wynne1005
|
8955fd2f4d
|
mes提测 还原pom
|
5 years ago |
|
wynne1005
|
23754d3f18
|
mes提测 还原pom
|
5 years ago |
|
wynne1005
|
81753d3260
|
Merge branch 'dev' into test
|
5 years ago |
|
wynne1005
|
0636daed51
|
Finish Task:1896 Cost:8h
|
5 years ago |
|
陈思洁
|
677cc85360
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
b2384619d4
|
【1891 队列条码打印-管理端】
|
5 years ago |
|
宋军超
|
fd9a2e6d15
|
Start Task #1887 Cost:8h Left:8h
|
5 years ago |
|
joke.wang
|
dd179a6d89
|
Fix Bug #8636
|
5 years ago |
|
joke.wang
|
1a72c16f14
|
Finish Task #1890 Cost:8h
|
5 years ago |
|
wynne1005
|
b48ba8c481
|
Finish Task #1876 Cost:32h
|
5 years ago |
|
wynne1005
|
8aef23e4ad
|
Finish Task #1876 edi webservice解析 Cost:32h
|
5 years ago |
|
陈思洁
|
4d63f9817e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
9b8342b7f5
|
【1865 客户JIT生产队列，自动下达定时JOB】
|
5 years ago |
|
钮海涛
|
999a415d27
|
修复版本问题
|
5 years ago |
|
钮海涛
|
b9cbf9684b
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
b303cf9a14
|
修复合并问题
|
5 years ago |
|
钮海涛
|
96fdbe0e07
|
Merge branch 'master' into test
|
5 years ago |
|
袁津哲
|
cad6b7ad89
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
f50b76cd1f
|
Task1858:电枪枪头更换计数
|
5 years ago |
|
陈思洁
|
5b167546e4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |