 钮海涛
|
ae3e17008e
|
修复版本问题
|
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 |
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 |
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 |
|
曾贞一
|
fef3c30eb5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
303e08b4cf
|
【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 |
 王杰
|
f64d894a4d
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
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 |