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 |
puxiao.liao
|
7f76cf0ad3
|
BH 需求修改
|
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 |
qianhs
|
86f6fefd5b
|
BH-CODE 出库，绑定
|
5 years ago |
 钮海涛
|
d0eea0eb9a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
470bceac6a
|
Start Task #1973 Cost:2h
Start Task #1971 Cost:2h
Start Task #1970 Cost:2h
Effort Task #1968 Cost:4h
|
5 years ago |
|
钮海涛
|
7286ce7ebb
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
f7c42ee90d
|
Start Task #1973 Cost:2h
Start Task #1971 Cost:2h
Start Task #1970 Cost:2h
|
5 years ago |
|
joke.wang
|
ca0b92aa6a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
joke.wang
|
a8241a1694
|
Start Task #1960 Cost:8h Left:8h
|
5 years ago |
|
puxiao.liao
|
1b84b3aeee
|
Fix bug#8637,8697
|
5 years ago |
|
宋军超
|
4d2f200677
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
a47eb08a8e
|
Start Task #1934 Cost:8h Left:8h
|
5 years ago |
袁津哲
|
399c9c828e
|
Fix Bug #1916,1917
|
5 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
|
5 years ago |
|
袁津哲
|
31bd8754df
|
Fix Bug #1916,1917
|
5 years ago |
|
宋军超
|
6f1bba9997
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
c2a5a17379
|
工步参数添加工步弹框参数字段
|
5 years ago |
 王杰
|
b0b276ba66
|
[任务：1938]
|
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 |
|
袁津哲
|
f4ff8205f6
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
a4bedf2354
|
Fix Bug #1916,1917
|
5 years ago |
|
钮海涛
|
f1a6f66ccb
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
15a3d95c61
|
Start Task #1968 Cost:3h
|
5 years ago |
|
puxiao.liao
|
b5aa990ea7
|
Fix bug#8633
|
5 years ago |
|
钮海涛
|
bbde1ebc9c
|
Merge branch 'dev' into test
|
5 years ago |
|
钮海涛
|
4d26c95639
|
Merge branch 'test' into dev
|
5 years ago |
|
陈思洁
|
3d0524ec1f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
a6ba3b6a5c
|
【8671 客户JIT队列，自动定时JOB-生成数据错误】
|
5 years ago |
|
puxiao.liao
|
7353b79b9c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
944b400f1e
|
Fix bug#8679
|
5 years ago |
|
joke.wang
|
d4f0ef157a
|
Finish Task #1915 Cost:8h
|
5 years ago |
|
qianhs
|
fcbaffa2b7
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
qianhs
|
b474ef1266
|
Finish Task #1813 Cost:32h
Finish Task #1814 Cost:32h
Finish Task #1815 Cost:16h
|
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 |
|
钮海涛
|
043e71649a
|
bh子检测项新增检测大类
|
5 years ago |
|
钮海涛
|
da21795f7f
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
f392a13832
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
|
钮海涛
|
d65d9a5a1d
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
puxiao.liao
|
91688ddab5
|
BH 需求变更
|
5 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
|
5 years ago |
|
puxiao.liao
|
e793667812
|
BH 需求变更
|
5 years ago |
|
钮海涛
|
e2e48f31bd
|
bh子检测项新增检测大类
|
5 years ago |
|
qianhs
|
5d32b43e51
|
BH-CODE 出库，绑定
|
5 years ago |
|
钮海涛
|
f4cccf5c9b
|
修改微服务model接口
|
5 years ago |
|
钮海涛
|
898f9a061d
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
81b5262a24
|
修改微服务model接口
|
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 |
 曾贞一
|
45b5812cb1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
cf507fdb48
|
【BATCH录入检测值-需要变更】
|
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 |
|
钮海涛
|
c344f017a9
|
修复sonar上的问题
|
5 years ago |
|
钮海涛
|
52f3758cee
|
Merge remote-tracking branch 'origin/dev' into dev
|
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
|
81b554fc8b
|
Merge branch '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 |
|
曾贞一
|
9e236a06a1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
6fc4641033
|
【BATCH录入检测值-需要变更】
|
5 years ago |
|
puxiao.liao
|
c2942b8a0d
|
BH 需求变更
|
5 years ago |
|
puxiao.liao
|
583c750055
|
BH 需求变更
|
5 years ago |
|
宋军超
|
fd9a2e6d15
|
Start Task #1887 Cost:8h Left:8h
|
5 years ago |
|
puxiao.liao
|
4f56baadef
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
71d936cc56
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
b060ba97aa
|
修改BH同步JOB逻辑
|
5 years ago |
|
puxiao.liao
|
75308c8989
|
BH 需求变更
|
5 years ago |
|
puxiao.liao
|
1dc9276e9a
|
BH 需求变更
|
5 years ago |
|
钮海涛
|
e91a6821bc
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartCheckType.java
|
5 years ago |
|
钮海涛
|
efc30f713f
|
修改BH同步JOB逻辑
|
5 years ago |
|
曾贞一
|
627b417256
|
【BATCH录入检测值-需要变更】
|
5 years ago |
|
曾贞一
|
765e0619ca
|
【BATCH录入检测值-需要变更】
|
5 years ago |
|
puxiao.liao
|
8c3f81292c
|
BH 需求变更
|
5 years ago |
|
puxiao.liao
|
c06fee639d
|
BH 需求变更
|
5 years ago |
|
qianhs
|
17b27da539
|
BH-CODE 出库，绑定
|
5 years ago |
|
王杰
|
074093a46d
|
[任务：1850 ，安灯流程设计]
|
5 years ago |
|
曾贞一
|
33c0ab4015
|
【BATCH录入检测值-需要变更】
|
5 years ago |
|
曾贞一
|
a4fdf07b4b
|
【BATCH录入检测值-需要变更】
|
5 years ago |
|
曾贞一
|
470e4986a9
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsCheckType.java
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QmsCheckTypeRepository.java
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSerialSnRepository.java
|
5 years ago |
|
曾贞一
|
72817fca4a
|
【BATCH录入检测值-需要变更】
|
5 years ago |
|
钮海涛
|
6d1c0bb46d
|
修改BH基础数据
|
5 years ago |
|
钮海涛
|
ad79c9fd7b
|
修改BH基础数据
|
5 years ago |
|
puxiao.liao
|
99955a70ff
|
bug7940【7940 推荐入库-未按最近距离推荐】
|
5 years ago |
|
puxiao.liao
|
443486a8cf
|
BH 需求变更-增加产品条码信息
|
5 years ago |