钮海涛
4d26c95639
Merge branch 'test' into dev
5 years ago
joke.wang
d4f0ef157a
Finish Task #1915 Cost:8h
5 years ago
qianhs
b474ef1266
Finish Task #1813 Cost:32h
...
Finish Task #1814 Cost:32h
Finish Task #1815 Cost:16h
5 years ago
钮海涛
47131ff13f
修复版本问题
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
qianhs
5d32b43e51
BH-CODE 出库,绑定
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
钮海涛
c344f017a9
修复sonar上的问题
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
陈思洁
677cc85360
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
陈思洁
b2384619d4
【1891 队列条码打印-管理端】
5 years ago
puxiao.liao
583c750055
BH 需求变更
5 years ago
宋军超
fd9a2e6d15
Start Task #1887 Cost:8h Left:8h
5 years ago
puxiao.liao
1dc9276e9a
BH 需求变更
5 years ago
puxiao.liao
c06fee639d
BH 需求变更
5 years ago
qianhs
17b27da539
BH-CODE 出库,绑定
5 years ago
王杰
074093a46d
[任务:1850 ,安灯流程设计]
5 years ago
钮海涛
ad79c9fd7b
修改BH基础数据
5 years ago
qianhs
f4c4b4a1f6
1,产品条码事务实体类提交
5 years ago
joke.wang
1a72c16f14
Finish Task #1890 Cost:8h
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
钮海涛
4921d55bda
修复版本问题
5 years ago
钮海涛
b303cf9a14
修复合并问题
5 years ago
钮海涛
96fdbe0e07
Merge branch 'master' into test
5 years ago
puxiao.liao
491bc32325
Fix Bug#8345
5 years ago
贾文涛
a68475d3d0
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
贾文涛
a8efa90089
bug 7461,count时去掉distinct。Fix Bug #7461
5 years ago
袁津哲
cad6b7ad89
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
袁津哲
f50b76cd1f
Task1858:电枪枪头更换计数
5 years ago
wynne1005
608aa6be90
还原pom
5 years ago
wynne1005
99d3c9d721
提测合并 还原pom
5 years ago
wynne1005
6dd2f12a2a
Merge branch 'dev' into test
5 years ago
wynne1005
5ef88c80c0
提测合并 还原pom
5 years ago
王杰
56ae714283
【任务:1845,安灯】
5 years ago
wei.peng
6169542dbb
合并代码 有代码丢失或者文件丢失请排查此处
...
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
5 years ago
wei.peng
9ee8acae91
合并代码 有代码丢失或者文件丢失请排查此处
5 years ago
袁津哲
08b03c9eb8
Task1858:电枪枪头更换计数
5 years ago
joke.wang
e2ce63a9cd
bug: [8533] plc数据类型改为枚举
5 years ago
joke.wang
88a0d6d02f
任务:[1828] 半成品绑定工步增加逻辑
5 years ago