宋军超
|
4d2f200677
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
宋军超
|
a47eb08a8e
|
Start Task #1934 Cost:8h Left:8h
|
6 years ago |
袁津哲
|
399c9c828e
|
Fix Bug #1916,1917
|
6 years ago |
|
袁津哲
|
271e7264a4
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
|
6 years ago |
|
袁津哲
|
31bd8754df
|
Fix Bug #1916,1917
|
6 years ago |
|
宋军超
|
6f1bba9997
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
 王杰
|
8d203eaf56
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
6 years ago |
|
宋军超
|
c2a5a17379
|
工步参数添加工步弹框参数字段
|
6 years ago |
|
王杰
|
b0b276ba66
|
[任务：1938]
|
6 years ago |
wynne1005
|
8ef3997038
|
还原pom
|
6 years ago |
|
wynne1005
|
4150543cb4
|
Effort Task #1940 Cost:16h Left:8h
|
6 years ago |
|
袁津哲
|
f4ff8205f6
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
a4bedf2354
|
Fix Bug #1916,1917
|
6 years ago |
 钮海涛
|
f1a6f66ccb
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
15a3d95c61
|
Start Task #1968 Cost:3h
|
6 years ago |
|
钮海涛
|
4d26c95639
|
Merge branch 'test' into dev
|
6 years ago |
puxiao.liao
|
7353b79b9c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
puxiao.liao
|
944b400f1e
|
Fix bug#8679
|
6 years ago |
joke.wang
|
d4f0ef157a
|
Finish Task #1915 Cost:8h
|
6 years ago |
qianhs
|
fcbaffa2b7
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
qianhs
|
b474ef1266
|
Finish Task #1813 Cost:32h
Finish Task #1814 Cost:32h
Finish Task #1815 Cost:16h
|
6 years ago |
|
宋军超
|
659b893903
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
宋军超
|
b05113f63c
|
Finish Task #1887 Cost:16h
|
6 years ago |
|
钮海涛
|
47131ff13f
|
修复版本问题
|
6 years ago |
|
钮海涛
|
ae3e17008e
|
修复版本问题
|
6 years ago |
|
钮海涛
|
da21795f7f
|
Merge branch 'test' into dev
|
6 years ago |
|
钮海涛
|
f392a13832
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
6 years ago |
|
puxiao.liao
|
91688ddab5
|
BH 需求变更
|
6 years ago |
|
puxiao.liao
|
8bca38a17d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
6 years ago |
|
puxiao.liao
|
e793667812
|
BH 需求变更
|
6 years ago |
|
qianhs
|
5d32b43e51
|
BH-CODE 出库，绑定
|
6 years ago |
|
钮海涛
|
f4cccf5c9b
|
修改微服务model接口
|
6 years ago |
|
钮海涛
|
898f9a061d
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
81b5262a24
|
修改微服务model接口
|
6 years ago |
|
袁津哲
|
37092cf2c5
|
Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能
|
6 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
|
6 years ago |
|
袁津哲
|
44f313abc4
|
Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能
|
6 years ago |
 曾贞一
|
45b5812cb1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
曾贞一
|
cf507fdb48
|
【BATCH录入检测值-需要变更】
|
6 years ago |
|
宋军超
|
9eda1f67b7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
宋军超
|
40672559e4
|
修改sonar--BUG类型问题
|
6 years ago |
|
钮海涛
|
c344f017a9
|
修复sonar上的问题
|
6 years ago |
|
钮海涛
|
52f3758cee
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
wynne1005
|
8955fd2f4d
|
mes提测 还原pom
|
6 years ago |
|
wynne1005
|
23754d3f18
|
mes提测 还原pom
|
6 years ago |
|
wynne1005
|
81753d3260
|
Merge branch 'dev' into test
|
6 years ago |
|
wynne1005
|
81b554fc8b
|
Merge branch 'test'
|
6 years ago |
|
wynne1005
|
0636daed51
|
Finish Task:1896 Cost:8h
|
6 years ago |
陈思洁
|
677cc85360
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
b2384619d4
|
【1891 队列条码打印-管理端】
|
6 years ago |